mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: merge master

Browse Source
This commit is contained in:
Hayden Kowalchuk 2019-08-07 21:02:43 -04:00
commit 9bc35d08e6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GL/matrix.c
View File

@ -50,8 +50,8 @@ void _glInitMatrices() {
stack_push(&MATRIX_STACKS[1], IDENTITY);
stack_push(&MATRIX_STACKS[2], IDENTITY);
memcpy(NORMAL_MATRIX, IDENTITY, sizeof(matrix_t));
memcpy(SCREENVIEW_MATRIX, IDENTITY, sizeof(matrix_t));
memcpy4(NORMAL_MATRIX, IDENTITY, sizeof(matrix_t));
memcpy4(SCREENVIEW_MATRIX, IDENTITY, sizeof(matrix_t));
glDepthRange(0.0f, 1.0f);
glViewport(0, 0, vid_mode->width, vid_mode->height);
@ -95,7 +95,7 @@ static void transpose(GLfloat* m) {
}
static void recalculateNormalMatrix() {
memcpy(NORMAL_MATRIX, stack_top(MATRIX_STACKS + (GL_MODELVIEW & 0xF)), sizeof(matrix_t));
memcpy4(NORMAL_MATRIX, stack_top(MATRIX_STACKS + (GL_MODELVIEW & 0xF)), sizeof(matrix_t));
inverse((GLfloat*) NORMAL_MATRIX);
transpose((GLfloat*) NORMAL_MATRIX);
}
@ -225,7 +225,7 @@ void glMultMatrixf(const GLfloat *m) {
{ 0.0f, 0.0f, 0.0f, 1.0f }
};
memcpy(TEMP, m, sizeof(matrix_t));
memcpy4(TEMP, m, sizeof(matrix_t));
mat_load(stack_top(MATRIX_STACKS + MATRIX_IDX));
mat_apply(&TEMP);

4
GL/state.c
View File

@ -619,10 +619,10 @@ void APIENTRY glGetBooleanv(GLenum pname, GLboolean* params) {
void APIENTRY glGetFloatv(GLenum pname, GLfloat* params) {
switch(pname) {
case GL_PROJECTION_MATRIX:
memcpy(params, _glGetProjectionMatrix(), sizeof(float) * 16);
memcpy4(params, _glGetProjectionMatrix(), sizeof(float) * 16);
break;
case GL_MODELVIEW_MATRIX:
memcpy(params, _glGetModelViewMatrix(), sizeof(float) * 16);
memcpy4(params, _glGetModelViewMatrix(), sizeof(float) * 16);
break;
default:
_glKosThrowError(GL_INVALID_ENUM, __func__);