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

gallium: remove redundant nr_components field from pipe_vertex_element

Browse Source 
This is a property of the associated src_format pipe format.
Hence use util_format_get_nr_components to query this when necessary instead.
This commit is contained in:
Roland Scheidegger
2010-02-17 16:44:38 +01:00
parent c2ad9e3801
commit 464a72dd41
13 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
progs/gallium/python/retrace/interpreter.py
View File

@@ -551,7 +551,6 @@ class Context(Object):
data = vbuf.buffer.read() data = vbuf.buffer.read()
values = unpack_from(format, data, offset) values = unpack_from(format, data, offset)
sys.stdout.write('\t\t{' + ', '.join(map(str, values)) + '},\n') sys.stdout.write('\t\t{' + ', '.join(map(str, values)) + '},\n')
assert len(values) == velem.nr_components
sys.stdout.write('\t},\n') sys.stdout.write('\t},\n')
sys.stdout.flush() sys.stdout.flush()

5
src/gallium/auxiliary/draw/draw_pt.c
View File

@@ -309,9 +309,8 @@ draw_arrays_instanced(struct draw_context *draw,
tgsi_dump(draw->vs.vertex_shader->state.tokens, 0); tgsi_dump(draw->vs.vertex_shader->state.tokens, 0);
debug_printf("Elements:\n"); debug_printf("Elements:\n");
for (i = 0; i < draw->pt.nr_vertex_elements; i++) { for (i = 0; i < draw->pt.nr_vertex_elements; i++) {
debug_printf(" format=%s comps=%u\n", debug_printf(" format=%s\n",
util_format_name(draw->pt.vertex_element[i].src_format), util_format_name(draw->pt.vertex_element[i].src_format));
draw->pt.vertex_element[i].nr_components);
} }
debug_printf("Buffers:\n"); debug_printf("Buffers:\n");
for (i = 0; i < draw->pt.nr_vertex_buffers; i++) { for (i = 0; i < draw->pt.nr_vertex_buffers; i++) {

1
src/gallium/auxiliary/util/u_draw_quad.c
View File

@@ -64,7 +64,6 @@ util_draw_vertex_buffer(struct pipe_context *pipe,
velements[i].instance_divisor = 0; velements[i].instance_divisor = 0;
velements[i].vertex_buffer_index = 0; velements[i].vertex_buffer_index = 0;
velements[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT; velements[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
velements[i].nr_components = 4;
} }
pipe->set_vertex_elements(pipe, num_attribs, velements); pipe->set_vertex_elements(pipe, num_attribs, velements);

1
src/gallium/auxiliary/util/u_dump_state.c
View File

@@ -701,7 +701,6 @@ util_dump_vertex_element(struct os_stream *stream, const struct pipe_vertex_elem
util_dump_member(stream, uint, state, src_offset); util_dump_member(stream, uint, state, src_offset);
util_dump_member(stream, uint, state, vertex_buffer_index); util_dump_member(stream, uint, state, vertex_buffer_index);
util_dump_member(stream, uint, state, nr_components);
util_dump_member(stream, format, state, src_format); util_dump_member(stream, format, state, src_format);

2
src/gallium/auxiliary/vl/vl_compositor.c
View File

@@ -317,7 +317,6 @@ init_buffers(struct vl_compositor *c)
c->vertex_elems[0].src_offset = 0; c->vertex_elems[0].src_offset = 0;
c->vertex_elems[0].instance_divisor = 0; c->vertex_elems[0].instance_divisor = 0;
c->vertex_elems[0].vertex_buffer_index = 0; c->vertex_elems[0].vertex_buffer_index = 0;
c->vertex_elems[0].nr_components = 2;
c->vertex_elems[0].src_format = PIPE_FORMAT_R32G32_FLOAT; c->vertex_elems[0].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* /*
@@ -347,7 +346,6 @@ init_buffers(struct vl_compositor *c)
c->vertex_elems[1].src_offset = 0; c->vertex_elems[1].src_offset = 0;
c->vertex_elems[1].instance_divisor = 0; c->vertex_elems[1].instance_divisor = 0;
c->vertex_elems[1].vertex_buffer_index = 1; c->vertex_elems[1].vertex_buffer_index = 1;
c->vertex_elems[1].nr_components = 2;
c->vertex_elems[1].src_format = PIPE_FORMAT_R32G32_FLOAT; c->vertex_elems[1].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* /*

8
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
View File

@@ -892,56 +892,48 @@ init_buffers(struct vl_mpeg12_mc_renderer *r)
r->vertex_elems[0].src_offset = 0; r->vertex_elems[0].src_offset = 0;
r->vertex_elems[0].instance_divisor = 0; r->vertex_elems[0].instance_divisor = 0;
r->vertex_elems[0].vertex_buffer_index = 0; r->vertex_elems[0].vertex_buffer_index = 0;
r->vertex_elems[0].nr_components = 2;
r->vertex_elems[0].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[0].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* Luma, texcoord element */ /* Luma, texcoord element */
r->vertex_elems[1].src_offset = sizeof(struct vertex2f); r->vertex_elems[1].src_offset = sizeof(struct vertex2f);
r->vertex_elems[1].instance_divisor = 0; r->vertex_elems[1].instance_divisor = 0;
r->vertex_elems[1].vertex_buffer_index = 0; r->vertex_elems[1].vertex_buffer_index = 0;
r->vertex_elems[1].nr_components = 2;
r->vertex_elems[1].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[1].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* Chroma Cr texcoord element */ /* Chroma Cr texcoord element */
r->vertex_elems[2].src_offset = sizeof(struct vertex2f) * 2; r->vertex_elems[2].src_offset = sizeof(struct vertex2f) * 2;
r->vertex_elems[2].instance_divisor = 0; r->vertex_elems[2].instance_divisor = 0;
r->vertex_elems[2].vertex_buffer_index = 0; r->vertex_elems[2].vertex_buffer_index = 0;
r->vertex_elems[2].nr_components = 2;
r->vertex_elems[2].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[2].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* Chroma Cb texcoord element */ /* Chroma Cb texcoord element */
r->vertex_elems[3].src_offset = sizeof(struct vertex2f) * 3; r->vertex_elems[3].src_offset = sizeof(struct vertex2f) * 3;
r->vertex_elems[3].instance_divisor = 0; r->vertex_elems[3].instance_divisor = 0;
r->vertex_elems[3].vertex_buffer_index = 0; r->vertex_elems[3].vertex_buffer_index = 0;
r->vertex_elems[3].nr_components = 2;
r->vertex_elems[3].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[3].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* First ref surface top field texcoord element */ /* First ref surface top field texcoord element */
r->vertex_elems[4].src_offset = 0; r->vertex_elems[4].src_offset = 0;
r->vertex_elems[4].instance_divisor = 0; r->vertex_elems[4].instance_divisor = 0;
r->vertex_elems[4].vertex_buffer_index = 1; r->vertex_elems[4].vertex_buffer_index = 1;
r->vertex_elems[4].nr_components = 2;
r->vertex_elems[4].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[4].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* First ref surface bottom field texcoord element */ /* First ref surface bottom field texcoord element */
r->vertex_elems[5].src_offset = sizeof(struct vertex2f); r->vertex_elems[5].src_offset = sizeof(struct vertex2f);
r->vertex_elems[5].instance_divisor = 0; r->vertex_elems[5].instance_divisor = 0;
r->vertex_elems[5].vertex_buffer_index = 1; r->vertex_elems[5].vertex_buffer_index = 1;
r->vertex_elems[5].nr_components = 2;
r->vertex_elems[5].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[5].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* Second ref surface top field texcoord element */ /* Second ref surface top field texcoord element */
r->vertex_elems[6].src_offset = 0; r->vertex_elems[6].src_offset = 0;
r->vertex_elems[6].instance_divisor = 0; r->vertex_elems[6].instance_divisor = 0;
r->vertex_elems[6].vertex_buffer_index = 2; r->vertex_elems[6].vertex_buffer_index = 2;
r->vertex_elems[6].nr_components = 2;
r->vertex_elems[6].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[6].src_format = PIPE_FORMAT_R32G32_FLOAT;
/* Second ref surface bottom field texcoord element */ /* Second ref surface bottom field texcoord element */
r->vertex_elems[7].src_offset = sizeof(struct vertex2f); r->vertex_elems[7].src_offset = sizeof(struct vertex2f);
r->vertex_elems[7].instance_divisor = 0; r->vertex_elems[7].instance_divisor = 0;
r->vertex_elems[7].vertex_buffer_index = 2; r->vertex_elems[7].vertex_buffer_index = 2;
r->vertex_elems[7].nr_components = 2;
r->vertex_elems[7].src_format = PIPE_FORMAT_R32G32_FLOAT; r->vertex_elems[7].src_format = PIPE_FORMAT_R32G32_FLOAT;
r->vs_const_buf = pipe_buffer_create r->vs_const_buf = pipe_buffer_create

5
src/gallium/drivers/i965/brw_draw_upload.c
View File

@@ -30,6 +30,7 @@
#include "util/u_upload_mgr.h" #include "util/u_upload_mgr.h"
#include "util/u_math.h" #include "util/u_math.h"
#include "util/u_format.h"
#include "brw_draw.h" #include "brw_draw.h"
#include "brw_defines.h" #include "brw_defines.h"
@@ -352,13 +353,15 @@ static int brw_emit_vertex_elements(struct brw_context *brw)
OUT_BATCH((CMD_VERTEX_ELEMENT << 16) | ((1 + nr * 2) - 2)); OUT_BATCH((CMD_VERTEX_ELEMENT << 16) | ((1 + nr * 2) - 2));
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
const struct pipe_vertex_element *input = &brw->curr.vertex_element[i]; const struct pipe_vertex_element *input = &brw->curr.vertex_element[i];
unsigned nr_components = util_format_get_nr_components(input->src_format);
uint32_t format = brw_translate_surface_format( input->src_format ); uint32_t format = brw_translate_surface_format( input->src_format );
uint32_t comp0 = BRW_VE1_COMPONENT_STORE_SRC; uint32_t comp0 = BRW_VE1_COMPONENT_STORE_SRC;
uint32_t comp1 = BRW_VE1_COMPONENT_STORE_SRC; uint32_t comp1 = BRW_VE1_COMPONENT_STORE_SRC;
uint32_t comp2 = BRW_VE1_COMPONENT_STORE_SRC; uint32_t comp2 = BRW_VE1_COMPONENT_STORE_SRC;
uint32_t comp3 = BRW_VE1_COMPONENT_STORE_SRC; uint32_t comp3 = BRW_VE1_COMPONENT_STORE_SRC;
switch (input->nr_components) { switch (nr_components) {
case 0: comp0 = BRW_VE1_COMPONENT_STORE_0; case 0: comp0 = BRW_VE1_COMPONENT_STORE_0;
case 1: comp1 = BRW_VE1_COMPONENT_STORE_0; case 1: comp1 = BRW_VE1_COMPONENT_STORE_0;
case 2: comp2 = BRW_VE1_COMPONENT_STORE_0; case 2: comp2 = BRW_VE1_COMPONENT_STORE_0;

27
src/gallium/drivers/nv50/nv50_vbo.c
View File

@@ -139,15 +139,16 @@ nv50_vbo_vtxelt_to_hw(struct pipe_vertex_element *ve)
uint32_t hw_type, hw_size; uint32_t hw_type, hw_size;
enum pipe_format pf = ve->src_format; enum pipe_format pf = ve->src_format;
const struct util_format_description *desc; const struct util_format_description *desc;
unsigned size; unsigned size, nr_components;
desc = util_format_description(pf); desc = util_format_description(pf);
assert(desc); assert(desc);
size = util_format_get_component_bits(pf, UTIL_FORMAT_COLORSPACE_RGB, 0); size = util_format_get_component_bits(pf, UTIL_FORMAT_COLORSPACE_RGB, 0);
nr_components = util_format_get_nr_components(pf);
hw_type = nv50_vbo_type_to_hw(pf); hw_type = nv50_vbo_type_to_hw(pf);
hw_size = nv50_vbo_size_to_hw(size, ve->nr_components); hw_size = nv50_vbo_size_to_hw(size, nr_components);
if (!hw_type || !hw_size) { if (!hw_type || !hw_size) {
NOUVEAU_ERR("unsupported vbo format: %s\n", util_format_name(pf)); NOUVEAU_ERR("unsupported vbo format: %s\n", util_format_name(pf));
@@ -222,11 +223,13 @@ nv50_set_static_vtxattr(struct nv50_context *nv50, unsigned i, void *data)
struct nouveau_grobj *tesla = nv50->screen->tesla; struct nouveau_grobj *tesla = nv50->screen->tesla;
struct nouveau_channel *chan = tesla->channel; struct nouveau_channel *chan = tesla->channel;
float v[4]; float v[4];
unsigned nr_components = util_format_get_nr_components(nv50->vtxelt[i].src_format);
util_format_read_4f(nv50->vtxelt[i].src_format, util_format_read_4f(nv50->vtxelt[i].src_format,
v, 0, data, 0, 0, 0, 1, 1); v, 0, data, 0, 0, 0, 1, 1);
switch (nv50->vtxelt[i].nr_components) { switch (nr_components) {
case 4: case 4:
BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_4F_X(i), 4); BEGIN_RING(chan, tesla, NV50TCL_VTX_ATTR_4F_X(i), 4);
OUT_RINGf (chan, v[0]); OUT_RINGf (chan, v[0]);
@@ -726,6 +729,7 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
struct nouveau_bo *bo = nouveau_bo(vb->buffer); struct nouveau_bo *bo = nouveau_bo(vb->buffer);
float v[4]; float v[4];
int ret; int ret;
unsigned nr_components = util_format_get_nr_components(ve->src_format);
ret = nouveau_bo_map(bo, NOUVEAU_BO_RD); ret = nouveau_bo_map(bo, NOUVEAU_BO_RD);
if (ret) if (ret)
@@ -738,7 +742,7 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
if (!so) if (!so)
*pso = so = so_new(nv50->vtxelt_nr, nv50->vtxelt_nr * 4, 0); *pso = so = so_new(nv50->vtxelt_nr, nv50->vtxelt_nr * 4, 0);
switch (ve->nr_components) { switch (nr_components) {
case 4: case 4:
so_method(so, tesla, NV50TCL_VTX_ATTR_4F_X(attrib), 4); so_method(so, tesla, NV50TCL_VTX_ATTR_4F_X(attrib), 4);
so_data (so, fui(v[0])); so_data (so, fui(v[0]));
@@ -1019,7 +1023,7 @@ emit_prepare(struct nv50_context *nv50, struct nv50_vbo_emitctx *emit,
for (i = 0; i < nv50->vtxelt_nr; ++i) { for (i = 0; i < nv50->vtxelt_nr; ++i) {
struct pipe_vertex_element *ve; struct pipe_vertex_element *ve;
struct pipe_vertex_buffer *vb; struct pipe_vertex_buffer *vb;
unsigned n, size; unsigned n, size, nr_components;
const struct util_format_description *desc; const struct util_format_description *desc;
ve = &nv50->vtxelt[i]; ve = &nv50->vtxelt[i];
@@ -1038,8 +1042,9 @@ emit_prepare(struct nv50_context *nv50, struct nv50_vbo_emitctx *emit,
size = util_format_get_component_bits( size = util_format_get_component_bits(
ve->src_format, UTIL_FORMAT_COLORSPACE_RGB, 0); ve->src_format, UTIL_FORMAT_COLORSPACE_RGB, 0);
nr_components = util_format_get_nr_components(ve->src_format);
assert(ve->nr_components > 0 && ve->nr_components <= 4); assert(nr_components > 0 && nr_components <= 4);
/* It shouldn't be necessary to push the implicit 1s /* It shouldn't be necessary to push the implicit 1s
* for case 3 and size 8 cases 1, 2, 3. * for case 3 and size 8 cases 1, 2, 3.
@@ -1049,25 +1054,25 @@ emit_prepare(struct nv50_context *nv50, struct nv50_vbo_emitctx *emit,
NOUVEAU_ERR("unsupported vtxelt size: %u\n", size); NOUVEAU_ERR("unsupported vtxelt size: %u\n", size);
return FALSE; return FALSE;
case 32: case 32:
switch (ve->nr_components) { switch (nr_components) {
case 1: emit->push[n] = emit_b32_1; break; case 1: emit->push[n] = emit_b32_1; break;
case 2: emit->push[n] = emit_b32_2; break; case 2: emit->push[n] = emit_b32_2; break;
case 3: emit->push[n] = emit_b32_3; break; case 3: emit->push[n] = emit_b32_3; break;
case 4: emit->push[n] = emit_b32_4; break; case 4: emit->push[n] = emit_b32_4; break;
} }
emit->vtx_dwords += ve->nr_components; emit->vtx_dwords += nr_components;
break; break;
case 16: case 16:
switch (ve->nr_components) { switch (nr_components) {
case 1: emit->push[n] = emit_b16_1; break; case 1: emit->push[n] = emit_b16_1; break;
case 2: emit->push[n] = emit_b32_1; break; case 2: emit->push[n] = emit_b32_1; break;
case 3: emit->push[n] = emit_b16_3; break; case 3: emit->push[n] = emit_b16_3; break;
case 4: emit->push[n] = emit_b32_2; break; case 4: emit->push[n] = emit_b32_2; break;
} }
emit->vtx_dwords += (ve->nr_components + 1) >> 1; emit->vtx_dwords += (nr_components + 1) >> 1;
break; break;
case 8: case 8:
switch (ve->nr_components) { switch (nr_components) {
case 1: emit->push[n] = emit_b08_1; break; case 1: emit->push[n] = emit_b08_1; break;
case 2: emit->push[n] = emit_b16_1; break; case 2: emit->push[n] = emit_b16_1; break;
case 3: emit->push[n] = emit_b08_3; break; case 3: emit->push[n] = emit_b08_3; break;

1
src/gallium/drivers/trace/tr_dump_state.c
View File

@@ -480,7 +480,6 @@ void trace_dump_vertex_element(const struct pipe_vertex_element *state)
trace_dump_member(uint, state, src_offset); trace_dump_member(uint, state, src_offset);
trace_dump_member(uint, state, vertex_buffer_index); trace_dump_member(uint, state, vertex_buffer_index);
trace_dump_member(uint, state, nr_components);
trace_dump_member(format, state, src_format); trace_dump_member(format, state, src_format);

1
src/gallium/include/pipe/p_state.h
View File

@@ -383,7 +383,6 @@ struct pipe_vertex_element
* this attribute live in? * this attribute live in?
*/ */
unsigned vertex_buffer_index:8; unsigned vertex_buffer_index:8;
unsigned nr_components:8;
enum pipe_format src_format; /**< PIPE_FORMAT_* */ enum pipe_format src_format; /**< PIPE_FORMAT_* */
}; };

1
src/gallium/state_trackers/vega/polygon.c
View File

@@ -296,7 +296,6 @@ static void draw_polygon(struct vg_context *ctx,
velement.instance_divisor = 0; velement.instance_divisor = 0;
velement.vertex_buffer_index = 0; velement.vertex_buffer_index = 0;
velement.src_format = PIPE_FORMAT_R32G32_FLOAT; velement.src_format = PIPE_FORMAT_R32G32_FLOAT;
velement.nr_components = COMPONENTS;
pipe->set_vertex_elements(pipe, 1, &velement); pipe->set_vertex_elements(pipe, 1, &velement);
/* draw */ /* draw */

3
src/mesa/state_tracker/st_draw.c
View File

@@ -368,7 +368,6 @@ setup_interleaved_attribs(GLcontext *ctx,
(unsigned) (arrays[mesaAttr]->Ptr - offset0); (unsigned) (arrays[mesaAttr]->Ptr - offset0);
velements[attr].instance_divisor = 0; velements[attr].instance_divisor = 0;
velements[attr].vertex_buffer_index = 0; velements[attr].vertex_buffer_index = 0;
velements[attr].nr_components = arrays[mesaAttr]->Size;
velements[attr].src_format = velements[attr].src_format =
st_pipe_vertex_format(arrays[mesaAttr]->Type, st_pipe_vertex_format(arrays[mesaAttr]->Type,
arrays[mesaAttr]->Size, arrays[mesaAttr]->Size,
@@ -458,7 +457,6 @@ setup_non_interleaved_attribs(GLcontext *ctx,
vbuffer[attr].max_index = max_index; vbuffer[attr].max_index = max_index;
velements[attr].instance_divisor = 0; velements[attr].instance_divisor = 0;
velements[attr].vertex_buffer_index = attr; velements[attr].vertex_buffer_index = attr;
velements[attr].nr_components = arrays[mesaAttr]->Size;
velements[attr].src_format velements[attr].src_format
= st_pipe_vertex_format(arrays[mesaAttr]->Type, = st_pipe_vertex_format(arrays[mesaAttr]->Type,
arrays[mesaAttr]->Size, arrays[mesaAttr]->Size,
@@ -596,7 +594,6 @@ st_draw_vbo(GLcontext *ctx,
for (i = 0; i < num_velements; i++) { for (i = 0; i < num_velements; i++) {
printf("vlements[%d].vbuffer_index = %u\n", i, velements[i].vertex_buffer_index); printf("vlements[%d].vbuffer_index = %u\n", i, velements[i].vertex_buffer_index);
printf("vlements[%d].src_offset = %u\n", i, velements[i].src_offset); printf("vlements[%d].src_offset = %u\n", i, velements[i].src_offset);
printf("vlements[%d].nr_comps = %u\n", i, velements[i].nr_components);
printf("vlements[%d].format = %s\n", i, util_format_name(velements[i].src_format)); printf("vlements[%d].format = %s\n", i, util_format_name(velements[i].src_format));
} }
} }

1
src/mesa/state_tracker/st_draw_feedback.c
View File

@@ -178,7 +178,6 @@ st_feedback_draw_vbo(GLcontext *ctx,
vbuffers[attr].max_index = max_index; vbuffers[attr].max_index = max_index;
velements[attr].instance_divisor = 0; velements[attr].instance_divisor = 0;
velements[attr].vertex_buffer_index = attr; velements[attr].vertex_buffer_index = attr;
velements[attr].nr_components = arrays[mesaAttr]->Size;
velements[attr].src_format = velements[attr].src_format =
st_pipe_vertex_format(arrays[mesaAttr]->Type, st_pipe_vertex_format(arrays[mesaAttr]->Type,
arrays[mesaAttr]->Size, arrays[mesaAttr]->Size,