ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix stupid merge

This commit is contained in:
RSDuck 2023-09-27 16:25:56 +02:00
parent a5791273d4
commit e7feddaea5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/OpenGLSupport.cpp
View File

@ -274,12 +274,13 @@ bool CompileComputeProgram(GLuint& result, const std::string& source, const std:
}*/ }*/
Log(LogLevel::Error, "Shader %s from cache was rejected\n", name.c_str()); Log(LogLevel::Error, "Shader %s from cache was rejected\n", name.c_str());
GLuint shader = glCreateShader(GL_COMPUTE_SHADER); GLuint shader;
bool linkingSucess = false; bool linkingSucess = false;
if (glDeleteProgram)
{ // If OpenGL isn't loaded, then there's no shader program to delete if (!glCreateShader || !glDeleteShader)
goto error; goto error;
}
shader = glCreateShader(GL_COMPUTE_SHADER);
if (!CompilerShader(shader, source, name, "compute")) if (!CompilerShader(shader, source, name, "compute"))
goto error; goto error;