zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: GetCaps() did not account for r_drawvoxels cvar

Browse source
This commit is contained in:
Rachael Alexanderson 2017-07-30 10:44:49 -04:00
parent d5733f515c
commit c07a4461a0
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gl/scene/gl_scene.cpp
View file

@ -85,6 +85,7 @@ EXTERN_CVAR (Bool, r_deathcamera)
EXTERN_CVAR (Float, underwater_fade_scalar) EXTERN_CVAR (Float, underwater_fade_scalar)
EXTERN_CVAR (Float, r_visibility) EXTERN_CVAR (Float, r_visibility)
EXTERN_CVAR (Bool, gl_legacy_mode) EXTERN_CVAR (Bool, gl_legacy_mode)
EXTERN_CVAR (Bool, r_drawvoxels)
extern bool NoInterpolateView; extern bool NoInterpolateView;
@ -1166,7 +1167,9 @@ uint32_t FGLInterface::GetCaps()
{ {
// describe our basic feature set // describe our basic feature set
ActorRenderFeatureFlags FlagSet = RFF_FLATSPRITES | RFF_MODELS | RFF_SLOPE3DFLOORS | ActorRenderFeatureFlags FlagSet = RFF_FLATSPRITES | RFF_MODELS | RFF_SLOPE3DFLOORS |
RFF_TILTPITCH | RFF_ROLLSPRITES | RFF_POLYGONAL | RFF_VOXELS; RFF_TILTPITCH | RFF_ROLLSPRITES | RFF_POLYGONAL;
if (r_drawvoxels)
FlagSet |= RFF_VOXELS;
if (gl_legacy_mode) if (gl_legacy_mode)
{ {
// legacy mode always has truecolor because palette tonemap is not available // legacy mode always has truecolor because palette tonemap is not available

5
src/swrenderer/r_swrenderer.cpp
View file

@ -60,7 +60,8 @@ CUSTOM_CVAR (Bool, cl_oldfreelooklimit, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG
} }
EXTERN_CVAR(Bool, r_shadercolormaps) EXTERN_CVAR(Bool, r_shadercolormaps)
EXTERN_CVAR(Float, maxviewpitch) // [SP] CVAR from GZDoom EXTERN_CVAR(Float, maxviewpitch) // [SP] CVAR from OpenGL Renderer
EXTERN_CVAR(Bool, r_drawvoxels)
CUSTOM_CVAR(Bool, r_polyrenderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR(Bool, r_polyrenderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
@ -385,7 +386,7 @@ uint32_t FSoftwareRenderer::GetCaps()
if (r_polyrenderer) if (r_polyrenderer)
FlagSet |= RFF_POLYGONAL | RFF_TILTPITCH; FlagSet |= RFF_POLYGONAL | RFF_TILTPITCH;
else else if (r_drawvoxels)
FlagSet |= RFF_VOXELS; FlagSet |= RFF_VOXELS;
if (screen && screen->IsBgra()) if (screen && screen->IsBgra())