diff options
| author | Mathias Fröhlich <[email protected]> | 2018-01-27 12:09:00 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-01-30 09:07:58 -0700 |
| commit | 11e665d4346d79f8bca5c6f47b1f274cefa8c326 (patch) | |
| tree | 87fd35072d8334c5d6d11db551430ca1a41eee8f /src/mesa | |
| parent | bc5c54cadfe23905e33b43ecf29dab42026c58a5 (diff) | |
mesa: Get the point size array state from varying_vp_inputs.
For the state key for hashing fixed function
vertex shaders, The varying_vp_inputs bitmask already
contains the point size array enabled information.
Signed-off-by: Mathias Fröhlich <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 44fbf4fb8a1..605c501b24f 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -64,7 +64,6 @@ struct state_key { unsigned fog_distance_mode:2; unsigned separate_specular:1; unsigned point_attenuated:1; - unsigned point_array:1; unsigned texture_enabled_global:1; unsigned fragprog_inputs_read:12; @@ -228,9 +227,6 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) if (ctx->Point._Attenuated) key->point_attenuated = 1; - if (ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled) - key->point_array = 1; - if (ctx->Texture._TexGenEnabled || ctx->Texture._TexMatEnabled || ctx->Texture._MaxEnabledTexImageUnit != -1) @@ -1589,7 +1585,7 @@ static void build_tnl_program( struct tnl_program *p ) if (p->state->point_attenuated) build_atten_pointsize(p); - else if (p->state->point_array) + else if (p->state->varying_vp_inputs & VERT_BIT_POINT_SIZE) build_array_pointsize(p); /* Finish up: |