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

Reverting last change (sorry about this, but changes should 

really go in trunk first)
This commit is contained in:
yabause 2009-01-01 22:13:59 +00:00
parent 34f0bd9a80
commit bd55e67a3c
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/OGLRender.cpp
View File

@ -307,20 +307,17 @@ static GLuint texBlendLoc;
static void createShaders()
{
const char *extString;
hasShaders = true;
extString = (const char*)glGetString(GL_EXTENSIONS);
if ((strstr(extString, "GL_ARB_shading_language_100") == NULL) ||
(strstr(extString, "GL_ARB_shader_objects") == NULL) ||
(strstr(extString, "GL_ARB_vertex_shader") == NULL) ||
(strstr(extString, "GL_ARB_fragment_shader") == NULL))
{
INFO("Your system doesn't support OpenGL shaders. Using fixed pipeline.\n");
hasShaders = false;
return;
}
if (glCreateShader == NULL || //use ==NULL instead of !func to avoid always true warnings for some systems
glShaderSource == NULL ||
glCompileShader == NULL ||
glCreateProgram == NULL ||
glAttachShader == NULL ||
glLinkProgram == NULL ||
glUseProgram == NULL ||
glGetShaderInfoLog == NULL)
NOSHADERS(1);
vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
if(!vertexShaderID)
@ -429,7 +426,9 @@ static char OGLInit(void)
#endif
/* Create the shaders */
createShaders();
//as a hack for 0.9 release, we're disabling shaders.
hasShaders = false;
//createShaders();
/* Assign the texture units : 0 for main textures, 1 for toon table */
/* Also init the locations for some variables in the shaders */