OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compute/setup fog coordinates even if vertex program is enabled.

Browse Source 
Only when fog's enabled, of course.
In the usual case, this is just a pass-through operation.
This commit is contained in:
H. Verbeet
2008-06-16 10:40:32 -06:00
committed by Brian Paul
parent ec2d0decbd
commit e9d1889891
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/tnl/t_pipeline.c
View File

@@ -199,11 +199,11 @@ const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
&_tnl_vertex_transform_stage, &_tnl_vertex_transform_stage,
&_tnl_normal_transform_stage, &_tnl_normal_transform_stage,
&_tnl_lighting_stage, &_tnl_lighting_stage,
&_tnl_fog_coordinate_stage,
&_tnl_texgen_stage, &_tnl_texgen_stage,
&_tnl_texture_transform_stage, &_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage, &_tnl_point_attenuation_stage,
&_tnl_vertex_program_stage, &_tnl_vertex_program_stage,
&_tnl_fog_coordinate_stage,
&_tnl_render_stage, &_tnl_render_stage,
NULL NULL
}; };

6
src/mesa/tnl/t_vb_fog.c
View File

@@ -148,11 +148,11 @@ run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
struct fog_stage_data *store = FOG_STAGE_DATA(stage); struct fog_stage_data *store = FOG_STAGE_DATA(stage);
GLvector4f *input; GLvector4f *input;
if (!ctx->Fog.Enabled || ctx->VertexProgram._Current)
if (!ctx->Fog.Enabled)
return GL_TRUE; return GL_TRUE;
if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT && !ctx->VertexProgram._Current) {
if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT) {
GLuint i; GLuint i;
GLfloat *coord; GLfloat *coord;
/* Fog is computed from vertex or fragment Z values */ /* Fog is computed from vertex or fragment Z values */