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

st/mesa: use correct TGSI texture target in bitmap fragment shader

Browse Source 
Depending on the driver's support for NPOT textures, we might use
a RECT texture instead of 2D texture.  We should propogate that info
to the fragment shader's TEX instruction.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul
2016-03-18 12:16:50 -06:00
parent 63e020d734
commit 83b5b3d66e
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_cb_bitmap.h
View File

@@ -49,7 +49,7 @@ st_flush_bitmap_cache(struct st_context *st);
extern const struct tgsi_token * extern const struct tgsi_token *
st_get_bitmap_shader(const struct tgsi_token *tokens, st_get_bitmap_shader(const struct tgsi_token *tokens,
unsigned sampler_index, unsigned tex_target, unsigned sampler_index,
bool use_texcoord, bool swizzle_xxxx); bool use_texcoord, bool swizzle_xxxx);
#endif /* ST_CB_BITMAP_H */ #endif /* ST_CB_BITMAP_H */

11
src/mesa/state_tracker/st_cb_bitmap_shader.c
View File

@@ -36,6 +36,7 @@ struct tgsi_bitmap_transform {
struct tgsi_transform_context base; struct tgsi_transform_context base;
struct tgsi_shader_info info; struct tgsi_shader_info info;
unsigned sampler_index; unsigned sampler_index;
unsigned tex_target;
bool use_texcoord; bool use_texcoord;
bool swizzle_xxxx; bool swizzle_xxxx;
bool first_instruction_emitted; bool first_instruction_emitted;
@@ -53,6 +54,8 @@ transform_instr(struct tgsi_transform_context *tctx,
{ {
struct tgsi_bitmap_transform *ctx = tgsi_bitmap_transform(tctx); struct tgsi_bitmap_transform *ctx = tgsi_bitmap_transform(tctx);
struct tgsi_full_instruction inst; struct tgsi_full_instruction inst;
unsigned tgsi_tex_target = ctx->tex_target == PIPE_TEXTURE_2D
? TGSI_TEXTURE_2D : TGSI_TEXTURE_RECT;
unsigned i, semantic; unsigned i, semantic;
int texcoord_index = -1; int texcoord_index = -1;
@@ -92,7 +95,7 @@ transform_instr(struct tgsi_transform_context *tctx,
tgsi_transform_tex_inst(tctx, tgsi_transform_tex_inst(tctx,
TGSI_FILE_TEMPORARY, 0, TGSI_FILE_TEMPORARY, 0,
TGSI_FILE_INPUT, texcoord_index, TGSI_FILE_INPUT, texcoord_index,
TGSI_TEXTURE_2D, ctx->sampler_index); tgsi_tex_target, ctx->sampler_index);
/* KIL if -tmp0 < 0 # texel=0 -> keep / texel=0 -> discard */ /* KIL if -tmp0 < 0 # texel=0 -> keep / texel=0 -> discard */
inst = tgsi_default_full_instruction(); inst = tgsi_default_full_instruction();
@@ -121,15 +124,19 @@ transform_instr(struct tgsi_transform_context *tctx,
const struct tgsi_token * const struct tgsi_token *
st_get_bitmap_shader(const struct tgsi_token *tokens, st_get_bitmap_shader(const struct tgsi_token *tokens,
unsigned sampler_index, unsigned tex_target, unsigned sampler_index,
bool use_texcoord, bool swizzle_xxxx) bool use_texcoord, bool swizzle_xxxx)
{ {
struct tgsi_bitmap_transform ctx; struct tgsi_bitmap_transform ctx;
struct tgsi_token *newtoks; struct tgsi_token *newtoks;
int newlen; int newlen;
assert(tex_target == PIPE_TEXTURE_2D ||
tex_target == PIPE_TEXTURE_RECT);
memset(&ctx, 0, sizeof(ctx)); memset(&ctx, 0, sizeof(ctx));
ctx.base.transform_instruction = transform_instr; ctx.base.transform_instruction = transform_instr;
ctx.tex_target = tex_target;
ctx.sampler_index = sampler_index; ctx.sampler_index = sampler_index;
ctx.use_texcoord = use_texcoord; ctx.use_texcoord = use_texcoord;
ctx.swizzle_xxxx = swizzle_xxxx; ctx.swizzle_xxxx = swizzle_xxxx;

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

@@ -871,6 +871,7 @@ st_create_fp_variant(struct st_context *st,
variant->bitmap_sampler = ffs(~stfp->Base.Base.SamplersUsed) - 1; variant->bitmap_sampler = ffs(~stfp->Base.Base.SamplersUsed) - 1;
tokens = st_get_bitmap_shader(tgsi.tokens, tokens = st_get_bitmap_shader(tgsi.tokens,
st->internal_target,
variant->bitmap_sampler, variant->bitmap_sampler,
st->needs_texcoord_semantic, st->needs_texcoord_semantic,
st->bitmap.tex_format == st->bitmap.tex_format ==