Skip to content

Commit 5343c4c

Browse files
committed
Add linearBlending/naiveBlending to expression_t
1 parent 9dcdce2 commit 5343c4c

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

src/engine/renderer/tr_local.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,8 @@ enum class ssaoMode {
745745
OP_GLOBAL5,
746746
OP_GLOBAL6,
747747
OP_GLOBAL7,
748+
OP_NAIVE_BLENDING,
749+
OP_LINEAR_BLENDING,
748750
OP_FRAGMENTSHADERS,
749751
OP_FRAMEBUFFEROBJECTS,
750752
OP_SOUND,

src/engine/renderer/tr_shade_calc.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,14 @@ static float GetOpValue( const expOperation_t *op )
176176
value = 1.0;
177177
break;
178178

179+
case opcode_t::OP_NAIVE_BLENDING:
180+
value = float( !tr.worldLinearizeTexture );
181+
break;
182+
183+
case opcode_t::OP_LINEAR_BLENDING:
184+
value = float( tr.worldLinearizeTexture );
185+
break;
186+
179187
case opcode_t::OP_FRAGMENTSHADERS:
180188
value = 1.0;
181189
break;
@@ -272,6 +280,8 @@ static float EvalExpression( const expression_t *exp, float defaultValue )
272280
case opcode_t::OP_GLOBAL5:
273281
case opcode_t::OP_GLOBAL6:
274282
case opcode_t::OP_GLOBAL7:
283+
case opcode_t::OP_NAIVE_BLENDING:
284+
case opcode_t::OP_LINEAR_BLENDING:
275285
case opcode_t::OP_FRAGMENTSHADERS:
276286
case opcode_t::OP_FRAMEBUFFEROBJECTS:
277287
case opcode_t::OP_SOUND:

src/engine/renderer/tr_shader.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ const opstring_t opStrings[] = {
275275
{"global5", opcode_t::OP_GLOBAL5},
276276
{"global6", opcode_t::OP_GLOBAL6},
277277
{"global7", opcode_t::OP_GLOBAL7},
278+
{"naiveBlending", opcode_t::OP_NAIVE_BLENDING},
279+
{"linearBlending", opcode_t::OP_LINEAR_BLENDING},
278280
{"fragmentShaders", opcode_t::OP_FRAGMENTSHADERS},
279281
{"frameBufferObjects", opcode_t::OP_FRAMEBUFFEROBJECTS},
280282
{"sound", opcode_t::OP_SOUND},
@@ -358,6 +360,8 @@ static bool IsOperand( opcode_t oc )
358360
case opcode_t::OP_GLOBAL5:
359361
case opcode_t::OP_GLOBAL6:
360362
case opcode_t::OP_GLOBAL7:
363+
case opcode_t::OP_NAIVE_BLENDING:
364+
case opcode_t::OP_LINEAR_BLENDING:
361365
case opcode_t::OP_FRAGMENTSHADERS:
362366
case opcode_t::OP_FRAMEBUFFEROBJECTS:
363367
case opcode_t::OP_SOUND:

0 commit comments

Comments
 (0)