cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-02-17 01:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed the soft sprite status console print always saying it's "ON" with GL3 and D3D11

Browse source
This commit is contained in:
myT 2020-04-05 06:40:34 +02:00
parent a5b6ee33da
commit 4e9d0ad709
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/renderer/tr_backend_d3d11.cpp
View file

@ -1693,7 +1693,7 @@ static qbool GAL_Init()
glInfo.displayFrequency = 0; glInfo.displayFrequency = 0;
glInfo.maxAnisotropy = D3D11_REQ_MAXANISOTROPY; // @NOTE: D3D10_REQ_MAXANISOTROPY == D3D11_REQ_MAXANISOTROPY glInfo.maxAnisotropy = D3D11_REQ_MAXANISOTROPY; // @NOTE: D3D10_REQ_MAXANISOTROPY == D3D11_REQ_MAXANISOTROPY
glInfo.maxTextureSize = MAX_GPU_TEXTURE_SIZE; glInfo.maxTextureSize = MAX_GPU_TEXTURE_SIZE;
glInfo.softSpriteSupport = qtrue; glInfo.softSpriteSupport = r_softSprites->integer == 1;
glInfo.mipGenSupport = mipGenOK; glInfo.mipGenSupport = mipGenOK;
glInfo.alphaToCoverageSupport = alphaToCoverageOK; glInfo.alphaToCoverageSupport = alphaToCoverageOK;

9
code/renderer/tr_backend_gl3.cpp
View file

@ -149,7 +149,7 @@ enum GenericUniform
GU_PROJECTION, GU_PROJECTION,
GU_CLIP_PLANE, GU_CLIP_PLANE,
GU_ALPHA_TEX, GU_ALPHA_TEX,
GU_GAMMA_BRIGHT_NOISE_SEED, GU_GAMMA_BRIGHT_NOISE_SEED, // @NOTE: not always defined
GU_COUNT GU_COUNT
}; };
@ -1967,6 +1967,8 @@ static void Init()
gl.errorMode = EM_FATAL; gl.errorMode = EM_FATAL;
} }
glInfo.softSpriteSupport = r_softSprites->integer == 1;
gl.pipelineId = PID_COUNT; gl.pipelineId = PID_COUNT;
ApplyPipeline(PID_GENERIC); ApplyPipeline(PID_GENERIC);
@ -2006,7 +2008,7 @@ static void InitGLInfo()
glInfo.maxAnisotropy = 0; glInfo.maxAnisotropy = 0;
} }
glInfo.softSpriteSupport = qtrue; glInfo.softSpriteSupport = qfalse;
glInfo.mipGenSupport = qfalse; glInfo.mipGenSupport = qfalse;
glInfo.alphaToCoverageSupport = qfalse; glInfo.alphaToCoverageSupport = qfalse;
} }
@ -2139,7 +2141,8 @@ static void DrawGeneric()
{ {
glUniform4fv(pipeline->uniformLocations[GU_CLIP_PLANE], 1, gl.clipPlane); glUniform4fv(pipeline->uniformLocations[GU_CLIP_PLANE], 1, gl.clipPlane);
} }
if(pipeline->uniformsDirty[GU_GAMMA_BRIGHT_NOISE_SEED]) if(pipeline->uniformsDirty[GU_GAMMA_BRIGHT_NOISE_SEED] &&
pipeline->uniformLocations[GU_GAMMA_BRIGHT_NOISE_SEED] != -1)
{ {
glUniform4f( glUniform4f(
pipeline->uniformLocations[GU_GAMMA_BRIGHT_NOISE_SEED], pipeline->uniformLocations[GU_GAMMA_BRIGHT_NOISE_SEED],

2
code/renderer/tr_shader.cpp
View file

@ -1937,7 +1937,7 @@ static void ProcessSoftSprite()
shader.softSprite = SST_NONE; shader.softSprite = SST_NONE;
if (!glInfo.softSpriteSupport || r_softSprites->integer == 0) if (!glInfo.softSpriteSupport)
return; return;
if (shader.sort <= SS_OPAQUE) if (shader.sort <= SS_OPAQUE)