summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_cb_drawtex.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker/st_cb_drawtex.c')
-rw-r--r--src/mesa/state_tracker/st_cb_drawtex.c124
1 files changed, 36 insertions, 88 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c
index 262ce39fbe1..413353e5f25 100644
--- a/src/mesa/state_tracker/st_cb_drawtex.c
+++ b/src/mesa/state_tracker/st_cb_drawtex.c
@@ -43,8 +43,7 @@ struct cached_shader
void *handle;
uint num_attribs;
- uint semantic_names[2 + MAX_TEXTURE_UNITS];
- uint semantic_indexes[2 + MAX_TEXTURE_UNITS];
+ gl_varying_slot slots[2 + MAX_TEXTURE_UNITS];
};
#define MAX_SHADERS (2 * MAX_TEXTURE_UNITS)
@@ -58,45 +57,26 @@ static struct cached_shader CachedShaders[MAX_SHADERS];
static GLuint NumCachedShaders = 0;
static gl_vert_attrib
-semantic_to_vert_attrib(unsigned semantic)
+slot_to_vert_attrib(gl_varying_slot slot)
{
- switch (semantic) {
- case TGSI_SEMANTIC_POSITION:
+ switch (slot) {
+ case VARYING_SLOT_POS:
return VERT_ATTRIB_POS;
- case TGSI_SEMANTIC_COLOR:
+ case VARYING_SLOT_COL0:
return VERT_ATTRIB_COLOR0;
- case TGSI_SEMANTIC_GENERIC:
- case TGSI_SEMANTIC_TEXCOORD:
+ case VARYING_SLOT_VAR0:
+ case VARYING_SLOT_TEX0:
return VERT_ATTRIB_GENERIC0;
default:
- unreachable("unhandled semantic");
- }
-}
-
-static gl_varying_slot
-semantic_to_varying_slot(unsigned semantic)
-{
- switch (semantic) {
- case TGSI_SEMANTIC_POSITION:
- return VARYING_SLOT_POS;
- case TGSI_SEMANTIC_COLOR:
- return VARYING_SLOT_COL0;
- case TGSI_SEMANTIC_GENERIC:
- case TGSI_SEMANTIC_TEXCOORD:
- return VARYING_SLOT_TEX0;
- default:
- unreachable("unhandled semantic");
+ unreachable("unhandled slot");
}
}
static void *
lookup_shader(struct st_context *st,
uint num_attribs,
- const enum tgsi_semantic *semantic_names,
- const uint *semantic_indexes)
+ const gl_varying_slot *slots)
{
- struct pipe_context *pipe = st->pipe;
- struct pipe_screen *screen = st->screen;
GLuint i, j;
/* look for existing shader with same attributes */
@@ -104,8 +84,7 @@ lookup_shader(struct st_context *st,
if (CachedShaders[i].num_attribs == num_attribs) {
GLboolean match = GL_TRUE;
for (j = 0; j < num_attribs; j++) {
- if (semantic_names[j] != CachedShaders[i].semantic_names[j] ||
- semantic_indexes[j] != CachedShaders[i].semantic_indexes[j]) {
+ if (slots[j] != CachedShaders[i].slots[j]) {
match = GL_FALSE;
break;
}
@@ -121,44 +100,28 @@ lookup_shader(struct st_context *st,
}
CachedShaders[i].num_attribs = num_attribs;
- for (j = 0; j < num_attribs; j++) {
- CachedShaders[i].semantic_names[j] = semantic_names[j];
- CachedShaders[i].semantic_indexes[j] = semantic_indexes[j];
- }
-
- enum pipe_shader_ir preferred_ir =
- screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
- PIPE_SHADER_CAP_PREFERRED_IR);
+ for (j = 0; j < num_attribs; j++)
+ CachedShaders[i].slots[j] = slots[j];
- if (preferred_ir == PIPE_SHADER_IR_NIR) {
- unsigned inputs[2 + MAX_TEXTURE_UNITS];
- unsigned outputs[2 + MAX_TEXTURE_UNITS];
-
- for (int j = 0; j < num_attribs; j++) {
- inputs[j] = semantic_to_vert_attrib(semantic_names[j]);
- outputs[j] = semantic_to_varying_slot(semantic_names[j]);
- }
+ unsigned inputs[2 + MAX_TEXTURE_UNITS];
- CachedShaders[i].handle =
- st_nir_make_passthrough_shader(st, "st/drawtex VS",
- MESA_SHADER_VERTEX,
- num_attribs, inputs,
- outputs, NULL, 0);
- } else {
- CachedShaders[i].handle =
- util_make_vertex_passthrough_shader(pipe,
- num_attribs,
- semantic_names,
- semantic_indexes, FALSE);
+ for (int j = 0; j < num_attribs; j++) {
+ inputs[j] = slot_to_vert_attrib(slots[j]);
}
+ CachedShaders[i].handle =
+ st_nir_make_passthrough_shader(st, "st/drawtex VS",
+ MESA_SHADER_VERTEX,
+ num_attribs, inputs,
+ slots, NULL, 0);
+
NumCachedShaders++;
return CachedShaders[i].handle;
}
-static void
+void
st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
GLfloat width, GLfloat height)
{
@@ -168,15 +131,14 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
struct pipe_resource *vbuffer = NULL;
GLuint i, numTexCoords, numAttribs;
GLboolean emitColor;
- enum tgsi_semantic semantic_names[2 + MAX_TEXTURE_UNITS];
- uint semantic_indexes[2 + MAX_TEXTURE_UNITS];
+ gl_varying_slot slots[2 + MAX_TEXTURE_UNITS];
struct cso_velems_state velems;
unsigned offset;
st_flush_bitmap_cache(st);
st_invalidate_readpix_cache(st);
- st_validate_state(st, ST_PIPELINE_META);
+ st_validate_state(st, ST_PIPELINE_META_STATE_MASK);
/* determine if we need vertex color */
if (ctx->FragmentProgram._Current->info.inputs_read & VARYING_BIT_COL0)
@@ -237,8 +199,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
SET_ATTRIB(2, 0, clip_x1, clip_y1, z, 1.0f); /* upper right */
SET_ATTRIB(3, 0, clip_x0, clip_y1, z, 1.0f); /* upper left */
- semantic_names[0] = TGSI_SEMANTIC_POSITION;
- semantic_indexes[0] = 0;
+ slots[0] = VARYING_SLOT_POS;
}
/* colors */
@@ -248,8 +209,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
SET_ATTRIB(1, 1, c[0], c[1], c[2], c[3]);
SET_ATTRIB(2, 1, c[0], c[1], c[2], c[3]);
SET_ATTRIB(3, 1, c[0], c[1], c[2], c[3]);
- semantic_names[1] = TGSI_SEMANTIC_COLOR;
- semantic_indexes[1] = 0;
+ slots[1] = VARYING_SLOT_COL0;
tex_attr = 2;
}
else {
@@ -275,10 +235,8 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
SET_ATTRIB(2, tex_attr, s1, t1, 0.0f, 1.0f); /* upper right */
SET_ATTRIB(3, tex_attr, s0, t1, 0.0f, 1.0f); /* upper left */
- semantic_names[tex_attr] = st->needs_texcoord_semantic ?
- TGSI_SEMANTIC_TEXCOORD : TGSI_SEMANTIC_GENERIC;
- /* XXX: should this use semantic index i instead of 0 ? */
- semantic_indexes[tex_attr] = 0;
+ slots[tex_attr] = st->needs_texcoord_semantic ?
+ VARYING_SLOT_TEX0 : VARYING_SLOT_VAR0;
tex_attr++;
}
@@ -298,8 +256,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
CSO_BIT_VERTEX_ELEMENTS));
{
- void *vs = lookup_shader(st, numAttribs,
- semantic_names, semantic_indexes);
+ void *vs = lookup_shader(st, numAttribs, slots);
cso_set_vertex_shader_handle(cso, vs);
}
cso_set_tessctrl_shader_handle(cso, NULL);
@@ -312,6 +269,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
velems.velems[i].vertex_buffer_index = 0;
velems.velems[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
velems.velems[i].dual_slot = false;
+ velems.velems[i].src_stride = numAttribs * 4 * sizeof(float);
}
velems.count = numAttribs;
@@ -321,7 +279,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
/* viewport state: viewport matching window dims */
{
const struct gl_framebuffer *fb = ctx->DrawBuffer;
- const GLboolean invert = (st_fb_orientation(fb) == Y_0_TOP);
+ const GLboolean invert = (_mesa_fb_orientation(fb) == Y_0_TOP);
const GLfloat width = (GLfloat)_mesa_geometric_width(fb);
const GLfloat height = (GLfloat)_mesa_geometric_height(fb);
struct pipe_viewport_state vp;
@@ -338,28 +296,18 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
cso_set_viewport(cso, &vp);
}
- util_draw_vertex_buffer(pipe, cso, vbuffer, 0,
- offset, /* offset */
- PIPE_PRIM_TRIANGLE_FAN,
+ util_draw_vertex_buffer(pipe, cso, vbuffer,
+ offset, true,
+ MESA_PRIM_TRIANGLE_FAN,
4, /* verts */
numAttribs); /* attribs/vert */
- st->last_num_vbuffers = MAX2(st->last_num_vbuffers, 1);
-
- pipe_resource_reference(&vbuffer, NULL);
/* restore state */
cso_restore_state(cso, 0);
- st->dirty |= ST_NEW_VERTEX_ARRAYS;
+ ctx->Array.NewVertexElements = true;
+ ctx->NewDriverState |= ST_NEW_VERTEX_ARRAYS;
}
-
-void
-st_init_drawtex_functions(struct dd_function_table *functions)
-{
- functions->DrawTex = st_DrawTex;
-}
-
-
/**
* Free any cached shaders
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 08:45:05 +0000