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

gallium: Update calls to the simple shader functions

Browse Source
This commit is contained in:
Brian
2008-03-27 15:42:52 -06:00
parent dccbfd8bf0
commit 6f8286163c
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,13 +487,15 @@ st_Bitmap(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
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,
semantic_names, semantic_names,
semantic_indexes); semantic_indexes,
&st->bitmap.vert_shader);
} }
st_validate_state(st); st_validate_state(st);
pt = make_bitmap_texture(ctx, width, height, unpack, bitmap); pt = make_bitmap_texture(ctx, width, height, unpack, bitmap);
if (pt) { if (pt) {
assert(pt->target == PIPE_TEXTURE_2D);
draw_bitmap_quad(ctx, x, y, ctx->Current.RasterPos[2], draw_bitmap_quad(ctx, x, y, ctx->Current.RasterPos[2],
width, height, width, height,
pt, stfp); pt, stfp);

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

@@ -251,7 +251,7 @@ clear_with_quad(GLcontext *ctx,
/* fragment shader state: color pass-through program */ /* fragment shader state: color pass-through program */
if (!st->clear.fs) { if (!st->clear.fs) {
st->clear.fs = util_make_fragment_passthrough_shader(pipe); st->clear.fs = util_make_fragment_passthrough_shader(pipe, &st->clear.frag_shader);
} }
pipe->bind_fs_state(pipe, st->clear.fs); pipe->bind_fs_state(pipe, st->clear.fs);
@@ -264,7 +264,8 @@ clear_with_quad(GLcontext *ctx,
const uint semantic_indexes[] = { 0, 0 }; const uint semantic_indexes[] = { 0, 0 };
st->clear.vs = util_make_vertex_passthrough_shader(pipe, 2, st->clear.vs = util_make_vertex_passthrough_shader(pipe, 2,
semantic_names, semantic_names,
semantic_indexes); semantic_indexes,
&st->clear.vert_shader);
} }
pipe->bind_vs_state(pipe, st->clear.vs); pipe->bind_vs_state(pipe, st->clear.vs);
#endif #endif

3
src/mesa/state_tracker/st_context.h
View File

@@ -147,6 +147,7 @@ struct st_context
struct st_fragment_program *program; /**< bitmap tex/kil program */ struct st_fragment_program *program; /**< bitmap tex/kil program */
GLuint user_prog_sn; /**< user fragment program serial no. */ GLuint user_prog_sn; /**< user fragment program serial no. */
struct st_fragment_program *combined_prog; struct st_fragment_program *combined_prog;
struct pipe_shader_state vert_shader;
void *vs; void *vs;
float vertices[4][3][4]; /**< vertex pos + color + texcoord */ float vertices[4][3][4]; /**< vertex pos + color + texcoord */
struct pipe_buffer *vbuf; struct pipe_buffer *vbuf;
@@ -154,6 +155,8 @@ struct st_context
/** for glClear */ /** for glClear */
struct { struct {
struct pipe_shader_state vert_shader;
struct pipe_shader_state frag_shader;
void *vs; void *vs;
void *fs; void *fs;
float vertices[4][2][4]; /**< vertex pos + color */ float vertices[4][2][4]; /**< vertex pos + color */