diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 04:05:02 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 04:23:54 +0300 |
| commit | a68cc0dc26bf55a9087375f8d104fcccd8571844 (patch) | |
| tree | 3e01e14e4efb48981b81328456d5a0c332830650 /source/blender/gpu/intern/gpu_draw.c | |
| parent | 67ffad8cd2b44d7685ec5aec2a76e1cb13d9f7a1 (diff) | |
OpenGL: use old API for texture matrix
New matrix API does not support texture matrices. Not sure what the final code will look like, but this at least avoids interference with new ModelView matrix.
Marked each line with TEXTURE so they can be disregarded during searches.
Related to T49450
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 9e9cd4df9c2..f5d5af3f373 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -420,7 +420,7 @@ void GPU_clear_tpage(bool force) GTS.curima = NULL; if (GTS.curtilemode != 0) { glMatrixMode(GL_TEXTURE); - gpuLoadIdentity(); + glLoadIdentity(); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); } GTS.curtilemode = 0; @@ -604,10 +604,10 @@ int GPU_verify_image( GTS.curtileYRep != GTS.tileYRep) { glMatrixMode(GL_TEXTURE); - gpuLoadIdentity(); + glLoadIdentity(); /* TEXTURE */ if (ima && (ima->tpageflag & IMA_TILES)) - gpuScale2f(ima->xrep, ima->yrep); + glScalef(ima->xrep, ima->yrep, 0); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); } @@ -2096,7 +2096,7 @@ void GPU_end_object_materials(void) /* resetting the texture matrix after the scaling needed for tiled textures */ if (GTS.tilemode) { glMatrixMode(GL_TEXTURE); - gpuLoadIdentity(); + glLoadIdentity(); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); } } @@ -2286,7 +2286,7 @@ void GPU_state_init(void) glDepthRange(0.0, 1.0); glMatrixMode(GL_TEXTURE); - gpuLoadIdentity(); + glLoadIdentity(); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); glFrontFace(GL_CCW); |