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

blitter: rename a few varibles to be more descriptive

Browse Source 
Related: https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/125

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Corentin Noël <corentin.noel@collabora.com>.
macos/master
Gert Wollny 3 years ago
parent 7894410d85
commit a01bee62a1
1 changed files with 25 additions and 25 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. 50
      src/vrend_blitter.c

50
src/vrend_blitter.c
Unescape View File

@ -79,9 +79,9 @@ struct vrend_blitter_delta {
int dy; int dy;
}; };
struct swizzle_and_type { struct blit_swizzle_and_type {
char *twm; char *swizzle;
char *ivec; char *type;
bool is_array; bool is_array;
}; };
@ -170,35 +170,35 @@ static enum tgsi_return_type tgsi_ret_for_format(enum virgl_formats format)
return TGSI_RETURN_TYPE_UNORM; return TGSI_RETURN_TYPE_UNORM;
} }
static void get_swizzle(int tgsi_tex_target, unsigned flags, static void blit_get_swizzle(int tgsi_tex_target, unsigned flags,
struct swizzle_and_type *retval) struct blit_swizzle_and_type *retval)
{ {
retval->twm = ""; retval->swizzle = "";
retval->ivec = ""; retval->type = "";
retval->is_array = false; retval->is_array = false;
switch (tgsi_tex_target) { switch (tgsi_tex_target) {
case TGSI_TEXTURE_1D: case TGSI_TEXTURE_1D:
if (flags & (BLIT_USE_GLES | BLIT_USE_DEPTH)) { if (flags & (BLIT_USE_GLES | BLIT_USE_DEPTH)) {
retval->twm = ".xy"; retval->swizzle = ".xy";
break; break;
} }
/* fallthrough */ /* fallthrough */
case TGSI_TEXTURE_BUFFER: case TGSI_TEXTURE_BUFFER:
retval->twm = ".x"; retval->swizzle = ".x";
break; break;
case TGSI_TEXTURE_2D_MSAA: case TGSI_TEXTURE_2D_MSAA:
if (flags & BLIT_USE_MSAA) { if (flags & BLIT_USE_MSAA) {
retval->ivec = "ivec2"; retval->type = "ivec2";
} }
/* fallthrough */ /* fallthrough */
case TGSI_TEXTURE_1D_ARRAY: case TGSI_TEXTURE_1D_ARRAY:
case TGSI_TEXTURE_2D: case TGSI_TEXTURE_2D:
case TGSI_TEXTURE_RECT: case TGSI_TEXTURE_RECT:
retval->twm = ".xy"; retval->swizzle = ".xy";
break; break;
case TGSI_TEXTURE_2D_ARRAY_MSAA: case TGSI_TEXTURE_2D_ARRAY_MSAA:
if (flags & BLIT_USE_MSAA) { if (flags & BLIT_USE_MSAA) {
retval->ivec = "ivec3"; retval->type = "ivec3";
retval->is_array = true; retval->is_array = true;
} }
/* fallthrough */ /* fallthrough */
@ -209,19 +209,19 @@ static void get_swizzle(int tgsi_tex_target, unsigned flags,
case TGSI_TEXTURE_3D: case TGSI_TEXTURE_3D:
case TGSI_TEXTURE_CUBE: case TGSI_TEXTURE_CUBE:
case TGSI_TEXTURE_2D_ARRAY: case TGSI_TEXTURE_2D_ARRAY:
retval->twm = ".xyz"; retval->swizzle = ".xyz";
break; break;
case TGSI_TEXTURE_SHADOWCUBE: case TGSI_TEXTURE_SHADOWCUBE:
case TGSI_TEXTURE_SHADOW2D_ARRAY: case TGSI_TEXTURE_SHADOW2D_ARRAY:
case TGSI_TEXTURE_SHADOWCUBE_ARRAY: case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
case TGSI_TEXTURE_CUBE_ARRAY: case TGSI_TEXTURE_CUBE_ARRAY:
retval->twm = ""; retval->swizzle = "";
break; break;
default: default:
if (flags & BLIT_USE_MSAA) { if (flags & BLIT_USE_MSAA) {
break; break;
} }
retval->twm = ".xy"; retval->swizzle = ".xy";
break; break;
} }
} }
@ -233,7 +233,7 @@ static GLuint blit_build_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
int nr_samples) int nr_samples)
{ {
char shader_buf[4096]; char shader_buf[4096];
struct swizzle_and_type retval; struct blit_swizzle_and_type swizzle_and_type;
unsigned flags = 0; unsigned flags = 0;
char dest_swizzle_snippet[DEST_SWIZZLE_SNIPPET_SIZE] = "texel"; char dest_swizzle_snippet[DEST_SWIZZLE_SNIPPET_SIZE] = "texel";
const char *ext_str = ""; const char *ext_str = "";
@ -249,20 +249,20 @@ static GLuint blit_build_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
flags |= BLIT_USE_GLES; flags |= BLIT_USE_GLES;
if (msaa) if (msaa)
flags |= BLIT_USE_MSAA; flags |= BLIT_USE_MSAA;
get_swizzle(tgsi_tex_target, flags, &retval); blit_get_swizzle(tgsi_tex_target, flags, &swizzle_and_type);
if (swizzle) if (swizzle)
create_dest_swizzle_snippet(swizzle, dest_swizzle_snippet); create_dest_swizzle_snippet(swizzle, dest_swizzle_snippet);
if (msaa) if (msaa)
snprintf(shader_buf, 4096, blit_ctx->use_gles ? snprintf(shader_buf, 4096, blit_ctx->use_gles ?
(retval.is_array ? FS_TEXFETCH_COL_MSAA_ARRAY_GLES (swizzle_and_type.is_array ? FS_TEXFETCH_COL_MSAA_ARRAY_GLES
: FS_TEXFETCH_COL_MSAA_GLES) : FS_TEXFETCH_COL_MSAA_GLES)
: FS_TEXFETCH_COL_MSAA_GL, : FS_TEXFETCH_COL_MSAA_GL,
ext_str, vec4_type_for_tgsi_ret(tgsi_ret), ext_str, vec4_type_for_tgsi_ret(tgsi_ret),
vrend_shader_samplerreturnconv(tgsi_ret), vrend_shader_samplerreturnconv(tgsi_ret),
vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target), vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target),
nr_samples, retval.ivec, retval.twm, dest_swizzle_snippet); nr_samples, swizzle_and_type.type, swizzle_and_type.swizzle, dest_swizzle_snippet);
else else
snprintf(shader_buf, 4096, blit_ctx->use_gles ? snprintf(shader_buf, 4096, blit_ctx->use_gles ?
(tgsi_tex_target == TGSI_TEXTURE_1D ? (tgsi_tex_target == TGSI_TEXTURE_1D ?
@ -271,7 +271,7 @@ static GLuint blit_build_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
ext_str, vec4_type_for_tgsi_ret(tgsi_ret), ext_str, vec4_type_for_tgsi_ret(tgsi_ret),
vrend_shader_samplerreturnconv(tgsi_ret), vrend_shader_samplerreturnconv(tgsi_ret),
vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target), vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target),
retval.twm, dest_swizzle_snippet); swizzle_and_type.swizzle, dest_swizzle_snippet);
VREND_DEBUG(dbg_blit, NULL, "-- Blit FS shader MSAA: %d -----------------\n" VREND_DEBUG(dbg_blit, NULL, "-- Blit FS shader MSAA: %d -----------------\n"
"%s\n---------------------------------------\n", msaa, shader_buf); "%s\n---------------------------------------\n", msaa, shader_buf);
@ -282,22 +282,22 @@ static GLuint blit_build_frag_tex_col(struct vrend_blitter_ctx *blit_ctx,
static GLuint blit_build_frag_depth(struct vrend_blitter_ctx *blit_ctx, int tgsi_tex_target, bool msaa) static GLuint blit_build_frag_depth(struct vrend_blitter_ctx *blit_ctx, int tgsi_tex_target, bool msaa)
{ {
char shader_buf[4096]; char shader_buf[4096];
struct swizzle_and_type retval; struct blit_swizzle_and_type swizzle_and_type;
unsigned flags = BLIT_USE_DEPTH; unsigned flags = BLIT_USE_DEPTH;
if (msaa) if (msaa)
flags |= BLIT_USE_MSAA; flags |= BLIT_USE_MSAA;
get_swizzle(tgsi_tex_target, flags, &retval); blit_get_swizzle(tgsi_tex_target, flags, &swizzle_and_type);
if (msaa) if (msaa)
snprintf(shader_buf, 4096, blit_ctx->use_gles ? snprintf(shader_buf, 4096, blit_ctx->use_gles ?
(retval.is_array ? FS_TEXFETCH_DS_MSAA_ARRAY_GLES : FS_TEXFETCH_DS_MSAA_GLES) (swizzle_and_type.is_array ? FS_TEXFETCH_DS_MSAA_ARRAY_GLES : FS_TEXFETCH_DS_MSAA_GLES)
: FS_TEXFETCH_DS_MSAA_GL, : FS_TEXFETCH_DS_MSAA_GL,
vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target), retval.ivec, retval.twm); vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target), swizzle_and_type.type, swizzle_and_type.swizzle);
else else
snprintf(shader_buf, 4096, blit_ctx->use_gles ? FS_TEXFETCH_DS_GLES : FS_TEXFETCH_DS_GL, snprintf(shader_buf, 4096, blit_ctx->use_gles ? FS_TEXFETCH_DS_GLES : FS_TEXFETCH_DS_GL,
vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target), retval.twm); vrend_shader_samplertypeconv(blit_ctx->use_gles, tgsi_tex_target), swizzle_and_type.swizzle);
return build_and_check(GL_FRAGMENT_SHADER, shader_buf); return build_and_check(GL_FRAGMENT_SHADER, shader_buf);
} }

Write Preview
Loading…
Cancel
Save