Skip to content

Commit 78d8381

Browse files
authored
Merge pull request #287 from taysta/rend2-fix
Rend2 Fix
2 parents f18b509 + 9457410 commit 78d8381

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

codemp/rd-vulkan/vk_pipelines.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ static void vk_create_blur_pipeline( char *name, int program_index, uint32_t ind
16991699
VkSpecializationInfo frag_spec_info;
17001700
VkRenderPass renderpass;
17011701
VkPipeline *pipeline;
1702-
uint32_t i;
1702+
//uint32_t i;
17031703

17041704
switch( program_index ){
17051705
case 1:

shared/rd-rend2/tr_backend.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,8 +2502,7 @@ static void RB_UpdateEntityLightConstants(
25022502
}
25032503

25042504
VectorCopy(lightDir, entityBlock.modelLightDir);
2505-
entityBlock.lightOrigin[3] = 0.0f;
2506-
entityBlock.lightRadius = lightRadius;
2505+
entityBlock.lightOrigin[3] = lightRadius;
25072506
}
25082507

25092508
static void RB_UpdateEntityMatrixConstants(
@@ -2513,7 +2512,6 @@ static void RB_UpdateEntityMatrixConstants(
25132512
orientationr_t ori;
25142513
R_RotateForEntity(refEntity, &backEnd.viewParms, &ori);
25152514
Matrix16Copy(ori.modelMatrix, entityBlock.modelMatrix);
2516-
VectorCopy(ori.viewOrigin, entityBlock.localViewOrigin);
25172515
}
25182516

25192517
static void RB_UpdateEntityModelConstants(

shared/rd-rend2/tr_local.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -798,13 +798,11 @@ struct EntityBlock
798798
matrix_t modelMatrix;
799799
vec4_t lightOrigin;
800800
vec3_t ambientLight;
801-
float lightRadius;
801+
float entityTime;
802802
vec3_t directedLight;
803803
float fxVolumetricBase;
804804
vec3_t modelLightDir;
805805
float vertexLerp;
806-
vec3_t localViewOrigin;
807-
float entityTime;
808806
bool operator == (const EntityBlock &other) const
809807
{
810808
return (

0 commit comments

Comments
 (0)