Skip to content

Commit 72db110

Browse files
committed
- fix GL renderer texture & shader regression
1 parent c0ccc7b commit 72db110

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

DriverLevelTool/viewer/gl_renderer.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ int g_CurrentBlendMode = BM_NONE;
2929
int g_CurrentDepthMode = 0;
3030
int g_CurrentCullMode = CULL_NONE;
3131
GrVAO* g_CurrentVAO = nullptr;
32-
TextureID g_lastBoundTexture = -1;
33-
ShaderID g_CurrentShader = -1;
32+
TextureID g_lastBoundTexture = 0;
33+
ShaderID g_CurrentShader = 0;
3434

3535
GLint u_MatrixUniforms[MATRIX_MODES];
3636
Matrix4x4 g_matrices[MATRIX_MODES];
@@ -352,7 +352,7 @@ ShaderID GR_CompileShader(const char* source)
352352
GLint sampler = 0;
353353
glUseProgram(program);
354354
glUniform1iv(glGetUniformLocation(program, "s_texture"), 1, &sampler);
355-
glUseProgram(0);
355+
glUseProgram(g_CurrentShader);
356356

357357
return program;
358358
}
@@ -451,7 +451,8 @@ TextureID GR_CreateRGBATexture(int width, int height, ubyte* data)
451451
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
452452
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
453453

454-
glBindTexture(GL_TEXTURE_2D, 0);
454+
// get back to last bound texture
455+
glBindTexture(GL_TEXTURE_2D, g_lastBoundTexture);
455456

456457
return newTexture;
457458
}

0 commit comments

Comments
 (0)