eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Try to fix webgl port.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5804 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-02-01 20:22:47 +00:00
parent b7050dbd46
commit 193d14a931
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
engine/gl/gl_vidcommon.c
View file

@ -1129,8 +1129,6 @@ static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
Con_Printf(CON_NOTICE "Mesa detected, disabling the use of glsl's invariant keyword."CON_DEFAULT" This will result in z-fighting. Use '+set gl_blacklist_mesa_invariant 0' on the commandline to reenable it (but you will probably get glsl compilation errors from your driver).\n"); Con_Printf(CON_NOTICE "Mesa detected, disabling the use of glsl's invariant keyword."CON_DEFAULT" This will result in z-fighting. Use '+set gl_blacklist_mesa_invariant 0' on the commandline to reenable it (but you will probably get glsl compilation errors from your driver).\n");
} }
if (gl_config.arb_shader_objects)
qglGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &gl_config.maxattribs);
#endif #endif
qglGetProgramBinary = NULL; qglGetProgramBinary = NULL;
@ -1148,6 +1146,7 @@ static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
qglGetProgramBinary = (void *)getglext("glGetProgramBinaryOES"); qglGetProgramBinary = (void *)getglext("glGetProgramBinaryOES");
qglProgramBinary = (void *)getglext("glProgramBinaryOES"); qglProgramBinary = (void *)getglext("glProgramBinaryOES");
} }
qglGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &gl_config.maxattribs);
} }
if (gl_config.glversion >= 4.5) //the core version if (gl_config.glversion >= 4.5) //the core version
@ -2898,7 +2897,7 @@ static void GLSlang_ProgAutoFields(program_t *prog, struct programpermu_s *pp, c
if (uniformloc != -1) if (uniformloc != -1)
{ {
if (shader_attr_names[i].ptype != uniformloc) if (shader_attr_names[i].ptype != uniformloc)
Con_Printf("Bad attribute: %s\n", shader_attr_names[i].name); Con_Printf("Bad attribute \"%s\" in glslprogram \"%s\" (%i should be %i)\n", shader_attr_names[i].name, prog?prog->name:"<NULL>", uniformloc, shader_attr_names[i].ptype);
else else
pp->attrmask |= 1u<<uniformloc; pp->attrmask |= 1u<<uniformloc;
} }