okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenGL2: Use loader for all extension funcs.

Browse source
This commit is contained in:
SmileTheory 2016-07-26 00:41:31 -07:00
parent 2ef99c8528
commit 716438168f
9 changed files with 158 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

8
code/renderergl2/tr_shade.c
View file

@ -1292,7 +1292,9 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
if (r_sunlightMode->integer && (backEnd.viewParms.flags & VPF_USESUNLIGHT) && (pStage->glslShaderIndex & LIGHTDEF_LIGHTTYPE_MASK))
{
GL_BindToTMU(tr.screenShadowImage, TB_SHADOWMAP);
// FIXME: screenShadowImage is NULL if no framebuffers
if (tr.screenShadowImage)
GL_BindToTMU(tr.screenShadowImage, TB_SHADOWMAP);
GLSL_SetUniformVec3(sp, UNIFORM_PRIMARYLIGHTAMBIENT, backEnd.refdef.sunAmbCol);
if (r_pbr->integer)
{
@ -1404,7 +1406,9 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
vec4_t vec;
cubemap_t *cubemap = &tr.cubemaps[input->cubemapIndex - 1];
GL_BindToTMU( cubemap->image, TB_CUBEMAP);
// FIXME: cubemap image could be NULL if cubemap isn't renderer or loaded
if (cubemap->image)
GL_BindToTMU( cubemap->image, TB_CUBEMAP);
VectorSubtract(cubemap->origin, backEnd.viewParms.or.origin, vec);
vec[3] = 1.0f;