Merge remote-tracking branch 'origin/morenewpalshader' into lugstuff
This commit is contained in:
commit
04fc735e12
1 file changed
+4
-7
@@ -58,8 +58,8 @@
|
||||
// ==========================================================================
|
||||
struct hwdriver_s hwdriver;
|
||||
|
||||
|
||||
boolean gr_shadersavailable = true;
|
||||
// false if shaders have not been initialized yet, or if shaders are not available
|
||||
boolean gr_shadersavailable = false;
|
||||
|
||||
// Whether the internal state is set to palette rendering or not.
|
||||
static boolean gr_palette_rendering_state = false;
|
||||
@@ -6460,11 +6460,8 @@ void HWR_Startup(void)
|
||||
HWR_InitMD2();
|
||||
|
||||
HWD.pfnSetupGLInfo();
|
||||
|
||||
// jimita
|
||||
HWD.pfnKillShaders();
|
||||
if (!HWD.pfnLoadShaders())
|
||||
gr_shadersavailable = false;
|
||||
|
||||
gr_shadersavailable = HWD.pfnLoadShaders();
|
||||
|
||||
HWR_SetShaderState();
|
||||
HWR_TogglePaletteRendering();
|
||||
|
||||
Reference in new issue
Block a user