diff options
| author | Marek Olšák <[email protected]> | 2017-11-15 23:24:56 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-11-25 17:17:52 +0100 |
| commit | 43abaf2ad0c1c42e56e47732395cc98912a050e8 (patch) | |
| tree | ed29562b5efc2979815b1179aee0d566d175e1e9 /src/mesa/drivers | |
| parent | 2116b974189b4d58d02bc1c9810aef820eed71b6 (diff) | |
mesa: remove unused vertex attrib WEIGHT
We don't support ARB_vertex_blend.
Note that the attribute aliasing check for ARB_vertex_program had to be
rewritten.
vbo_context: 20344 -> 20008 bytes
gl_context: 74672 -> 74616 bytes
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_maos_arrays.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vertprog.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_maos_arrays.c b/src/mesa/drivers/dri/r200/r200_maos_arrays.c index 60f851be56c..a3d45cf7369 100644 --- a/src/mesa/drivers/dri/r200/r200_maos_arrays.c +++ b/src/mesa/drivers/dri/r200/r200_maos_arrays.c @@ -102,9 +102,7 @@ void r200EmitArrays( struct gl_context *ctx, GLubyte *vimap_rev ) } break; case 1: - assert(attrib == VERT_ATTRIB_WEIGHT); - emitsize = (VB->AttribPtr[attrib]->size); - vfmt0 |= emitsize << R200_VTX_WEIGHT_COUNT_SHIFT; + unreachable("r200: vertex weight attrib unsupported"); break; case 2: assert(attrib == VERT_ATTRIB_NORMAL); diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c index bb8550332b3..c3606b50ff0 100644 --- a/src/mesa/drivers/dri/r200/r200_vertprog.c +++ b/src/mesa/drivers/dri/r200/r200_vertprog.c @@ -498,11 +498,6 @@ static GLboolean r200_translate_vertex_program(struct gl_context *ctx, struct r2 free_inputs &= ~(1 << 0); array_count++; } - if (mesa_vp->info.inputs_read & VERT_BIT_WEIGHT) { - vp->inputs[VERT_ATTRIB_WEIGHT] = 12; - vp->inputmap_rev[1] = VERT_ATTRIB_WEIGHT; - array_count++; - } if (mesa_vp->info.inputs_read & VERT_BIT_NORMAL) { vp->inputs[VERT_ATTRIB_NORMAL] = 1; vp->inputmap_rev[2] = VERT_ATTRIB_NORMAL; |