third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shader: convert txfi to string conversion

Browse Source 
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
macos/master
Dave Airlie 7 years ago
parent 68d1eb4bb4
commit 72c6538ecc
1 changed files with 10 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      src/vrend_shader.c

20
src/vrend_shader.c
Unescape View File

@ -1497,7 +1497,7 @@ static int translate_tex(struct dump_ctx *ctx,
bool dst0_override_no_wm, bool dst0_override_no_wm,
bool tg4_has_component) bool tg4_has_component)
{ {
const char *txfi; enum vrend_type_qualifier txfi = TYPE_CONVERSION_NONE;
unsigned twm = TGSI_WRITEMASK_NONE, gwm = TGSI_WRITEMASK_NONE; unsigned twm = TGSI_WRITEMASK_NONE, gwm = TGSI_WRITEMASK_NONE;
enum vrend_type_qualifier dtypeprefix = TYPE_CONVERSION_NONE; enum vrend_type_qualifier dtypeprefix = TYPE_CONVERSION_NONE;
bool is_shad = false; bool is_shad = false;
@ -1537,11 +1537,11 @@ static int translate_tex(struct dump_ctx *ctx,
twm = TGSI_WRITEMASK_NONE; twm = TGSI_WRITEMASK_NONE;
else else
twm = TGSI_WRITEMASK_X; twm = TGSI_WRITEMASK_X;
txfi = "int"; txfi = INT;
break; break;
case TGSI_TEXTURE_1D_ARRAY: case TGSI_TEXTURE_1D_ARRAY:
twm = TGSI_WRITEMASK_XY; twm = TGSI_WRITEMASK_XY;
txfi = "ivec2"; txfi = IVEC2;
break; break;
case TGSI_TEXTURE_2D: case TGSI_TEXTURE_2D:
case TGSI_TEXTURE_RECT: case TGSI_TEXTURE_RECT:
@ -1549,7 +1549,7 @@ static int translate_tex(struct dump_ctx *ctx,
twm = TGSI_WRITEMASK_NONE; twm = TGSI_WRITEMASK_NONE;
else else
twm = TGSI_WRITEMASK_XY; twm = TGSI_WRITEMASK_XY;
txfi = "ivec2"; txfi = IVEC2;
break; break;
case TGSI_TEXTURE_SHADOW1D: case TGSI_TEXTURE_SHADOW1D:
case TGSI_TEXTURE_SHADOW2D: case TGSI_TEXTURE_SHADOW2D:
@ -1562,20 +1562,20 @@ static int translate_tex(struct dump_ctx *ctx,
twm = TGSI_WRITEMASK_XY; twm = TGSI_WRITEMASK_XY;
else else
twm = TGSI_WRITEMASK_XYZ; twm = TGSI_WRITEMASK_XYZ;
txfi = "ivec3"; txfi = IVEC3;
break; break;
case TGSI_TEXTURE_CUBE: case TGSI_TEXTURE_CUBE:
case TGSI_TEXTURE_2D_ARRAY: case TGSI_TEXTURE_2D_ARRAY:
twm = TGSI_WRITEMASK_XYZ; twm = TGSI_WRITEMASK_XYZ;
txfi = "ivec3"; txfi = IVEC3;
break; break;
case TGSI_TEXTURE_2D_MSAA: case TGSI_TEXTURE_2D_MSAA:
twm = TGSI_WRITEMASK_XY; twm = TGSI_WRITEMASK_XY;
txfi = "ivec2"; txfi = IVEC2;
break; break;
case TGSI_TEXTURE_2D_ARRAY_MSAA: case TGSI_TEXTURE_2D_ARRAY_MSAA:
twm = TGSI_WRITEMASK_XYZ; twm = TGSI_WRITEMASK_XYZ;
txfi = "ivec3"; txfi = IVEC3;
break; break;
case TGSI_TEXTURE_SHADOWCUBE: case TGSI_TEXTURE_SHADOWCUBE:
@ -1589,7 +1589,7 @@ static int translate_tex(struct dump_ctx *ctx,
twm = TGSI_WRITEMASK_XYZ; twm = TGSI_WRITEMASK_XYZ;
else else
twm = TGSI_WRITEMASK_NONE; twm = TGSI_WRITEMASK_NONE;
txfi = ""; txfi = TYPE_CONVERSION_NONE;
break; break;
} }
@ -1756,7 +1756,7 @@ static int translate_tex(struct dump_ctx *ctx,
} }
} }
if (inst->Instruction.Opcode == TGSI_OPCODE_TXF) { if (inst->Instruction.Opcode == TGSI_OPCODE_TXF) {
snprintf(buf, 255, "%s = %s(%s(texelFetch%s(%s, %s(%s%s)%s%s)%s));\n", dsts[0], dstconv, get_string(dtypeprefix), tex_ext, srcs[sampler_index], txfi, srcs[0], get_wm_string(twm), bias, offbuf, dst0_override_no_wm ? "" : writemask); snprintf(buf, 255, "%s = %s(%s(texelFetch%s(%s, %s(%s%s)%s%s)%s));\n", dsts[0], dstconv, get_string(dtypeprefix), tex_ext, srcs[sampler_index], get_string(txfi), srcs[0], get_wm_string(twm), bias, offbuf, dst0_override_no_wm ? "" : writemask);
} else if (ctx->cfg->glsl_version < 140 && (ctx->shader_req_bits & SHADER_REQ_SAMPLER_RECT)) { } else if (ctx->cfg->glsl_version < 140 && (ctx->shader_req_bits & SHADER_REQ_SAMPLER_RECT)) {
/* rect is special in GLSL 1.30 */ /* rect is special in GLSL 1.30 */
if (inst->Texture.Texture == TGSI_TEXTURE_RECT) if (inst->Texture.Texture == TGSI_TEXTURE_RECT)

Write Preview
Loading…
Cancel
Save