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

st/mesa: fix bitmap,drawpix,drawtex for PIPE_CAP_TGSI_TEXCOORD

Browse Source 
NOTE: Changed the semantic index for the drawtex coordinate to
be the texture unit index instead of always 0.
Not sure if this is correct but since the value seems to depend
on the unit it would make sense to use different varying slots.
This commit is contained in:
Christoph Bumiller
2013-03-30 14:57:21 +01:00
parent 2a8145d36b
commit e45c969fe5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,6 +766,7 @@ st_Bitmap(struct gl_context *ctx, GLint x, GLint y,
/* create pass-through vertex shader now */ /* create pass-through vertex shader now */
const uint semantic_names[] = { TGSI_SEMANTIC_POSITION, const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,
TGSI_SEMANTIC_COLOR, TGSI_SEMANTIC_COLOR,
st->needs_texcoord_semantic ? TGSI_SEMANTIC_TEXCOORD :
TGSI_SEMANTIC_GENERIC }; TGSI_SEMANTIC_GENERIC };
const uint semantic_indexes[] = { 0, 0, 0 }; const uint semantic_indexes[] = { 0, 0, 0 };
st->bitmap.vs = util_make_vertex_passthrough_shader(st->pipe, 3, st->bitmap.vs = util_make_vertex_passthrough_shader(st->pipe, 3,

5
src/mesa/state_tracker/st_cb_drawpixels.c
View File

@@ -294,6 +294,9 @@ static void *
make_passthrough_vertex_shader(struct st_context *st, make_passthrough_vertex_shader(struct st_context *st,
GLboolean passColor) GLboolean passColor)
{ {
const unsigned texcoord_semantic = st->needs_texcoord_semantic ?
TGSI_SEMANTIC_TEXCOORD : TGSI_SEMANTIC_GENERIC;
if (!st->drawpix.vert_shaders[passColor]) { if (!st->drawpix.vert_shaders[passColor]) {
struct ureg_program *ureg = ureg_create( TGSI_PROCESSOR_VERTEX ); struct ureg_program *ureg = ureg_create( TGSI_PROCESSOR_VERTEX );
@@ -307,7 +310,7 @@ make_passthrough_vertex_shader(struct st_context *st,
/* MOV result.texcoord0, vertex.attr[1]; */ /* MOV result.texcoord0, vertex.attr[1]; */
ureg_MOV(ureg, ureg_MOV(ureg,
ureg_DECL_output( ureg, TGSI_SEMANTIC_GENERIC, 0 ), ureg_DECL_output( ureg, texcoord_semantic, 0 ),
ureg_DECL_vs_input( ureg, 1 )); ureg_DECL_vs_input( ureg, 1 ));
if (passColor) { if (passColor) {

4
src/mesa/state_tracker/st_cb_drawtex.c
View File

@@ -209,7 +209,9 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
SET_ATTRIB(2, attr, s1, t1, 0.0f, 1.0f); /* upper right */ SET_ATTRIB(2, attr, s1, t1, 0.0f, 1.0f); /* upper right */
SET_ATTRIB(3, attr, s0, t1, 0.0f, 1.0f); /* upper left */ SET_ATTRIB(3, attr, s0, t1, 0.0f, 1.0f); /* upper left */
semantic_names[attr] = TGSI_SEMANTIC_GENERIC; semantic_names[attr] = st->needs_texcoord_semantic ?
TGSI_SEMANTIC_TEXCOORD : TGSI_SEMANTIC_GENERIC;
/* XXX: should this use semantic index i instead of 0 ? */
semantic_indexes[attr] = 0; semantic_indexes[attr] = 0;
attr++; attr++;