AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

submit vertex weights to make World of Warcraft maybe happy (bug 8250)

Browse Source 
submit the vertex weights to hw, which will enable broken vertex programs
errorneously using them to work. Note however that this will only work
if glWeight is used, there is no code in mesa at all to deal with weight
vertex array (glWeightPointerARB).
This commit is contained in:
Roland Scheidegger
2006-12-14 00:34:44 +01:00
parent 6c305c0831
commit 2956a0c8a8
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r200/r200_context.h
+1
View File
@@ -735,6 +735,7 @@ struct r200_tcl_info {
GLuint *Elts;
struct r200_dma_region indexed_verts;
struct r200_dma_region weight;
struct r200_dma_region obj;
struct r200_dma_region rgba;
struct r200_dma_region spec;
src/mesa/drivers/dri/r200/r200_maos_arrays.c
+18 -1
View File
@@ -423,7 +423,21 @@ void r200EmitArrays( GLcontext *ctx, GLuint inputs )
count );
}
component[nr++] = &rmesa->tcl.generic[geninput];
vfmt0 |= R200_VTX_W0 | R200_VTX_Z0;
vfmt0 |= R200_VTX_W0 | R200_VTX_Z0;
}
if (inputs & VERT_BIT_WEIGHT) {
if (!rmesa->tcl.weight.buf)
emit_vector( ctx,
&rmesa->tcl.weight,
(char *)VB->AttribPtr[VERT_ATTRIB_WEIGHT]->data,
VB->AttribPtr[VERT_ATTRIB_WEIGHT]->size,
VB->AttribPtr[VERT_ATTRIB_WEIGHT]->stride,
count);
assert(VB->AttribPtr[VERT_ATTRIB_WEIGHT]->size <= 4);
vfmt0 |= VB->AttribPtr[VERT_ATTRIB_WEIGHT]->size << R200_VTX_WEIGHT_COUNT_SHIFT;
component[nr++] = &rmesa->tcl.weight;
}
if (inputs & VERT_BIT_NORMAL) {
@@ -672,6 +686,9 @@ void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs )
if (newinputs & VERT_BIT_POS)
r200ReleaseDmaRegion( rmesa, &rmesa->tcl.obj, __FUNCTION__ );
if (newinputs & VERT_BIT_WEIGHT)
r200ReleaseDmaRegion( rmesa, &rmesa->tcl.weight, __FUNCTION__ );
if (newinputs & VERT_BIT_NORMAL)
r200ReleaseDmaRegion( rmesa, &rmesa->tcl.norm, __FUNCTION__ );
src/mesa/drivers/dri/r200/r200_vertprog.c
-1
View File
@@ -503,7 +503,6 @@ static GLboolean r200_translate_vertex_program(GLcontext *ctx, struct r200_verte
array_count++;
}
if (mesa_vp->Base.InputsRead & VERT_BIT_WEIGHT) {
/* we don't actually handle that later. Then again, we don't have to... */
vp->inputs[VERT_ATTRIB_WEIGHT] = 12;
array_count++;
}