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

r300-gallium: A handful of tiny vfmt fixups.

Browse Source 
Using a tab of inputs should work, but I keep getting bad results.
If only Rawhide's GDB wasn't broken...
This commit is contained in:
Corbin Simpson
2009-02-26 21:25:06 -08:00
parent 17c7852bf9
commit 65021162a4
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_state_derived.c
+18 -11
View File
@@ -57,34 +57,39 @@ static uint32_t translate_vertex_data_type(int type) {
/* XXX this function should be able to handle vert shaders as well as draw */
static void r300_update_vertex_layout(struct r300_context* r300)
{
struct r300_vertex_format vformat;
struct vertex_info vinfo;
boolean pos = false, psize = false, fog = false;
int i, texs = 0, cols = 0;
int tab[16];
struct tgsi_shader_info* info = &r300->fs->info;
memset(&vinfo, 0, sizeof(vinfo));
for (i = 0; i < 16; i++) {
tab[i] = -1;
}
assert(info->num_inputs <= 16);
/* This is rather lame. Since draw_find_vs_output doesn't return an error
* when it can't find an output, we have to pre-iterate and count each
* output ourselves. */
for (i = 0; i < info->num_inputs; i++) {
switch (info->input_semantic_name[i]) {
case TGSI_SEMANTIC_POSITION:
pos = true;
tab[i] = 0;
break;
case TGSI_SEMANTIC_COLOR:
cols++;
tab[i] = 2 + cols++;
break;
case TGSI_SEMANTIC_FOG:
fog = true;
break;
case TGSI_SEMANTIC_PSIZE:
psize = true;
tab[i] = 1;
break;
case TGSI_SEMANTIC_GENERIC:
texs++;
tab[i] = 6 + texs++;
break;
default:
debug_printf("r300: Unknown vertex input %d\n",
@@ -105,6 +110,7 @@ static void r300_update_vertex_layout(struct r300_context* r300)
if (!pos) {
debug_printf("r300: Forcing vertex position attribute emit...\n");
tab[0] = 0;
}
draw_emit_vertex_attr(&vinfo, EMIT_4F, INTERP_POS,
@@ -152,18 +158,19 @@ static void r300_update_vertex_layout(struct r300_context* r300)
(0xf << R300_WRITE_ENA_SHIFT))
for (i = 0; i < vinfo.num_attribs; i++) {
/* Make sure we have a proper destination for our attribute */
//assert(tab[i] != -1);
temp = translate_vertex_data_type(vinfo.attrib[i].emit) |
R300_SIGNED;
(tab[i] << R300_DST_VEC_LOC_SHIFT) | R300_SIGNED;
if (i & 1) {
r300->vertex_info.vap_prog_stream_cntl[i >> 1] &= 0xffff0000;
r300->vertex_info.vap_prog_stream_cntl[i >> 1] |=
(translate_vertex_data_type(vinfo.attrib[i].emit) |
R300_SIGNED) << 16;
temp << 16;
} else {
r300->vertex_info.vap_prog_stream_cntl[i >> 1] &= 0xffff;
r300->vertex_info.vap_prog_stream_cntl[i >> 1] |=
translate_vertex_data_type(vinfo.attrib[i].emit) |
R300_SIGNED;
temp;
}
r300->vertex_info.vap_prog_stream_cntl_ext[i >> 1] |=
@@ -180,7 +187,7 @@ static void r300_update_vertex_layout(struct r300_context* r300)
/* Set up the RS block. This is the part of the chipset that actually does
* the rasterization of vertices into fragments. This is also the part of the
* chipset that locks up if any part of it is even slightly wrong. */
void r300_update_rs_block(struct r300_context* r300)
static void r300_update_rs_block(struct r300_context* r300)
{
}
src/gallium/drivers/r300/r300_swtcl_emit.c
+6 -2
View File
@@ -27,6 +27,7 @@
#include "r300_cs.h"
#include "r300_context.h"
#include "r300_reg.h"
#include "r300_state_derived.h"
/* r300_swtcl_emit: Vertex and index buffer primitive emission. No HW TCL. */
@@ -191,12 +192,15 @@ static void prepare_render(struct r300_swtcl_render* render)
* PACKET3 [3D_LOAD_VBPNTR]
* COUNT [1]
* FORMAT [size | stride << 8]
* OFFSET [0]
* VBPNTR [relocated BO]
*/
BEGIN_CS(5);
OUT_CS(CP_PACKET3(R300_PACKET3_3D_LOAD_VBPNTR, 3));
OUT_CS(1);
OUT_CS(r300->vertex_info.vinfo.size | (r300->vertex_info.vinfo.size << 8));
OUT_CS(r300->vertex_info.vinfo.size |
(r300->vertex_info.vinfo.size << 8));
OUT_CS(render->vbo_offset);
OUT_CS_RELOC(render->vbo, 0, RADEON_GEM_DOMAIN_GTT, 0, 0);
END_CS;
}
@@ -218,7 +222,7 @@ static void r300_swtcl_render_draw_arrays(struct vbuf_render* render,
BEGIN_CS(2);
OUT_CS(CP_PACKET3(R300_PACKET3_3D_DRAW_VBUF_2, 0));
OUT_CS(R300_VAP_VF_CNTL__PRIM_WALK_VERTEX_LIST | (count << 16) |
r300render->hwprim | R300_VAP_VF_CNTL__INDEX_SIZE_32bit);
r300render->hwprim);
END_CS;
}