X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fffvertex_prog.c;h=04126fe9b9034bb5f1e133e98efd4353ab93c736;hb=b4b1df5a1750e42307a18b660c6e162df5907535;hp=605c501b24fa2ec001b36ead408964f5ea22c05f;hpb=11e665d4346d79f8bca5c6f47b1f274cefa8c326;p=mesa.git diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 605c501b24f..04126fe9b90 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -33,6 +33,7 @@ */ +#include "main/errors.h" #include "main/glheader.h" #include "main/mtypes.h" #include "main/macros.h" @@ -51,6 +52,10 @@ #define NUM_UNITS MAX2(MAX_TEXTURE_COORD_UNITS, MAX_LIGHTS) struct state_key { + GLbitfield varying_vp_inputs; + + unsigned fragprog_inputs_read:12; + unsigned light_color_material_mask:12; unsigned light_global_enabled:1; unsigned light_local_viewer:1; @@ -60,28 +65,22 @@ struct state_key { unsigned normalize:1; unsigned rescale_normals:1; - unsigned fog_source_is_depth:1; unsigned fog_distance_mode:2; unsigned separate_specular:1; unsigned point_attenuated:1; - unsigned texture_enabled_global:1; - unsigned fragprog_inputs_read:12; - - GLbitfield varying_vp_inputs; struct { - unsigned light_enabled:1; - unsigned light_eyepos3_is_zero:1; - unsigned light_spotcutoff_is_180:1; - unsigned light_attenuated:1; - unsigned texunit_really_enabled:1; - unsigned texmat_enabled:1; - unsigned coord_replace:1; - unsigned texgen_enabled:4; - unsigned texgen_mode0:4; - unsigned texgen_mode1:4; - unsigned texgen_mode2:4; - unsigned texgen_mode3:4; + unsigned char light_enabled:1; + unsigned char light_eyepos3_is_zero:1; + unsigned char light_spotcutoff_is_180:1; + unsigned char light_attenuated:1; + unsigned char texmat_enabled:1; + unsigned char coord_replace:1; + unsigned char texgen_enabled:1; + unsigned char texgen_mode0:4; + unsigned char texgen_mode1:4; + unsigned char texgen_mode2:4; + unsigned char texgen_mode3:4; } unit[NUM_UNITS]; }; @@ -111,17 +110,22 @@ static GLuint translate_texgen( GLboolean enabled, GLenum mode ) #define FDM_EYE_RADIAL 0 #define FDM_EYE_PLANE 1 #define FDM_EYE_PLANE_ABS 2 +#define FDM_FROM_ARRAY 3 -static GLuint translate_fog_distance_mode( GLenum mode ) +static GLuint translate_fog_distance_mode(GLenum source, GLenum mode) { - switch (mode) { - case GL_EYE_RADIAL_NV: - return FDM_EYE_RADIAL; - case GL_EYE_PLANE: - return FDM_EYE_PLANE; - default: /* shouldn't happen; fall through to a sensible default */ - case GL_EYE_PLANE_ABSOLUTE_NV: - return FDM_EYE_PLANE_ABS; + if (source == GL_FRAGMENT_DEPTH_EXT) { + switch (mode) { + case GL_EYE_RADIAL_NV: + return FDM_EYE_RADIAL; + case GL_EYE_PLANE: + return FDM_EYE_PLANE; + default: /* shouldn't happen; fall through to a sensible default */ + case GL_EYE_PLANE_ABSOLUTE_NV: + return FDM_EYE_PLANE_ABS; + } + } else { + return FDM_FROM_ARRAY; } } @@ -135,7 +139,7 @@ static GLboolean check_active_shininess( struct gl_context *ctx, (key->light_color_material_mask & (1 << attr))) return GL_TRUE; - if (key->varying_vp_inputs & VERT_BIT_GENERIC(attr)) + if (key->varying_vp_inputs & VERT_BIT_MAT(attr)) return GL_TRUE; if (ctx->Light.Material.Attrib[attr][0] != 0.0F) @@ -166,9 +170,6 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) key->fragprog_inputs_read |= (VARYING_BIT_COL0 | VARYING_BIT_TEX0); } - key->separate_specular = (ctx->Light.Model.ColorControl == - GL_SEPARATE_SPECULAR_COLOR); - if (ctx->Light.Enabled) { key->light_global_enabled = 1; @@ -178,6 +179,9 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) if (ctx->Light.Model.TwoSide) key->light_twoside = 1; + if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) + key->separate_specular = 1; + if (ctx->Light.ColorMaterialEnabled) { key->light_color_material_mask = ctx->Light._ColorMaterialBitmask; } @@ -219,27 +223,21 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) if (ctx->Transform.RescaleNormals) key->rescale_normals = 1; - if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT) { - key->fog_source_is_depth = 1; - key->fog_distance_mode = translate_fog_distance_mode(ctx->Fog.FogDistanceMode); - } + /* Only distinguish fog parameters if we actually need */ + if (key->fragprog_inputs_read & VARYING_BIT_FOGC) + key->fog_distance_mode = + translate_fog_distance_mode(ctx->Fog.FogCoordinateSource, + ctx->Fog.FogDistanceMode); if (ctx->Point._Attenuated) key->point_attenuated = 1; - if (ctx->Texture._TexGenEnabled || - ctx->Texture._TexMatEnabled || - ctx->Texture._MaxEnabledTexImageUnit != -1) - key->texture_enabled_global = 1; - mask = ctx->Texture._EnabledCoordUnits | ctx->Texture._TexGenEnabled | ctx->Texture._TexMatEnabled | ctx->Point.CoordReplace; while (mask) { const int i = u_bit_scan(&mask); - struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; - - if (texUnit->_Current) - key->unit[i].texunit_really_enabled = 1; + struct gl_fixedfunc_texture_unit *texUnit = + &ctx->Texture.FixedFuncUnit[i]; if (ctx->Point.PointSprite) if (ctx->Point.CoordReplace & (1u << i)) @@ -416,7 +414,7 @@ static struct ureg register_param5(struct tnl_program *p, GLint s3, GLint s4) { - gl_state_index tokens[STATE_LENGTH]; + gl_state_index16 tokens[STATE_LENGTH]; GLint idx; tokens[0] = s0; tokens[1] = s1; @@ -855,7 +853,8 @@ static void set_material_flags( struct tnl_program *p ) p->color_materials = p->state->light_color_material_mask; } - p->materials |= (p->state->varying_vp_inputs >> VERT_ATTRIB_GENERIC0); + p->materials |= ((p->state->varying_vp_inputs & VERT_BIT_MAT_ALL) + >> VERT_ATTRIB_MAT(0)); } @@ -870,7 +869,7 @@ static struct ureg get_material( struct tnl_program *p, GLuint side, /* Put material values in the GENERIC slots -- they are not used * for anything in fixed function mode. */ - return register_input( p, attrib + VERT_ATTRIB_GENERIC0 ); + return register_input( p, VERT_ATTRIB_MAT(attrib) ); } else return register_param3( p, STATE_MATERIAL, side, property ); @@ -1297,32 +1296,30 @@ static void build_fog( struct tnl_program *p ) struct ureg fog = register_output(p, VARYING_SLOT_FOGC); struct ureg input; - if (p->state->fog_source_is_depth) { - - switch (p->state->fog_distance_mode) { - case FDM_EYE_RADIAL: /* Z = sqrt(Xe*Xe + Ye*Ye + Ze*Ze) */ - input = get_eye_position(p); - emit_op2(p, OPCODE_DP3, fog, WRITEMASK_X, input, input); - emit_op1(p, OPCODE_RSQ, fog, WRITEMASK_X, fog); - emit_op1(p, OPCODE_RCP, fog, WRITEMASK_X, fog); - break; - case FDM_EYE_PLANE: /* Z = Ze */ - input = get_eye_position_z(p); - emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input); - break; - case FDM_EYE_PLANE_ABS: /* Z = abs(Ze) */ - input = get_eye_position_z(p); - emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input); - break; - default: - assert(!"Bad fog mode in build_fog()"); - break; - } - + switch (p->state->fog_distance_mode) { + case FDM_EYE_RADIAL: { /* Z = sqrt(Xe*Xe + Ye*Ye + Ze*Ze) */ + struct ureg tmp = get_temp(p); + input = get_eye_position(p); + emit_op2(p, OPCODE_DP3, tmp, WRITEMASK_X, input, input); + emit_op1(p, OPCODE_RSQ, tmp, WRITEMASK_X, tmp); + emit_op1(p, OPCODE_RCP, fog, WRITEMASK_X, tmp); + break; } - else { + case FDM_EYE_PLANE: /* Z = Ze */ + input = get_eye_position_z(p); + emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input); + break; + case FDM_EYE_PLANE_ABS: /* Z = abs(Ze) */ + input = get_eye_position_z(p); + emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input); + break; + case FDM_FROM_ARRAY: input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X); emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input); + break; + default: + assert(!"Bad fog mode in build_fog()"); + break; } emit_op1(p, OPCODE_MOV, fog, WRITEMASK_YZW, get_identity_param(p)); @@ -1653,6 +1650,9 @@ _mesa_get_fixed_func_vertex_program(struct gl_context *ctx) struct gl_program *prog; struct state_key key; + /* We only update ctx->varying_vp_inputs when in VP_MODE_FF _VPMode */ + assert(VP_MODE_FF == ctx->VertexProgram._VPMode); + /* Grab all the relevant state and put it in a single structure: */ make_state_key(ctx, &key);