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

renderer: fixup texture-swizzling without view-support

Browse Source 
We can't cache the current states on the texture-view, as multiple views
can point to the same texture. Instead, we need to cache the state on
the texture.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Fixes: 8d288c4 ("vrend: update texture state on a per view base")
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
macos/master
Erik Faye-Lund 7 years ago committed by Dave Airlie
parent d9a4be4d0a
commit 30c3b751fd
1 changed files with 95 additions and 79 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. 174
      src/vrend_renderer.c

174
src/vrend_renderer.c
Unescape View File

@ -337,6 +337,12 @@ struct vrend_shader_selector {
struct vrend_texture { struct vrend_texture {
struct vrend_resource base; struct vrend_resource base;
struct pipe_sampler_state state; struct pipe_sampler_state state;
GLenum cur_swizzle_r;
GLenum cur_swizzle_g;
GLenum cur_swizzle_b;
GLenum cur_swizzle_a;
GLuint cur_srgb_decode;
GLuint cur_base, cur_max;
}; };
struct vrend_surface { struct vrend_surface {
@ -372,14 +378,8 @@ struct vrend_sampler_view {
GLuint gl_swizzle_g; GLuint gl_swizzle_g;
GLuint gl_swizzle_b; GLuint gl_swizzle_b;
GLuint gl_swizzle_a; GLuint gl_swizzle_a;
GLenum cur_swizzle_r;
GLenum cur_swizzle_g;
GLenum cur_swizzle_b;
GLenum cur_swizzle_a;
GLuint cur_base, cur_max;
GLenum depth_texture_mode; GLenum depth_texture_mode;
GLuint srgb_decode; GLuint srgb_decode;
GLuint cur_srgb_decode;
struct vrend_resource *texture; struct vrend_resource *texture;
}; };
@ -1791,8 +1791,6 @@ int vrend_create_sampler_view(struct vrend_context *ctx,
view->target = tgsitargettogltarget((format >> 24) & 0xff, res->base.nr_samples); view->target = tgsitargettogltarget((format >> 24) & 0xff, res->base.nr_samples);
view->val0 = val0; view->val0 = val0;
view->val1 = val1; view->val1 = val1;
view->cur_base = -1;
view->cur_max = 10000;
swizzle[0] = swizzle_packed & 0x7; swizzle[0] = swizzle_packed & 0x7;
swizzle[1] = (swizzle_packed >> 3) & 0x7; swizzle[1] = (swizzle_packed >> 3) & 0x7;
@ -1803,7 +1801,41 @@ int vrend_create_sampler_view(struct vrend_context *ctx,
view->id = view->texture->id; view->id = view->texture->id;
if (has_feature(feat_texture_view) && !view->texture->is_buffer) { view->srgb_decode = GL_DECODE_EXT;
if (view->format != view->texture->base.format) {
if (util_format_is_srgb(view->texture->base.format) &&
!util_format_is_srgb(view->format))
view->srgb_decode = GL_SKIP_DECODE_EXT;
}
if (!(util_format_has_alpha(view->format) || util_format_is_depth_or_stencil(view->format))) {
if (swizzle[0] == PIPE_SWIZZLE_ALPHA)
swizzle[0] = PIPE_SWIZZLE_ONE;
if (swizzle[1] == PIPE_SWIZZLE_ALPHA)
swizzle[1] = PIPE_SWIZZLE_ONE;
if (swizzle[2] == PIPE_SWIZZLE_ALPHA)
swizzle[2] = PIPE_SWIZZLE_ONE;
if (swizzle[3] == PIPE_SWIZZLE_ALPHA)
swizzle[3] = PIPE_SWIZZLE_ONE;
}
if (tex_conv_table[view->format].flags & VIRGL_BIND_NEED_SWIZZLE) {
if (swizzle[0] <= PIPE_SWIZZLE_ALPHA)
swizzle[0] = tex_conv_table[view->format].swizzle[swizzle[0]];
if (swizzle[1] <= PIPE_SWIZZLE_ALPHA)
swizzle[1] = tex_conv_table[view->format].swizzle[swizzle[1]];
if (swizzle[2] <= PIPE_SWIZZLE_ALPHA)
swizzle[2] = tex_conv_table[view->format].swizzle[swizzle[2]];
if (swizzle[3] <= PIPE_SWIZZLE_ALPHA)
swizzle[3] = tex_conv_table[view->format].swizzle[swizzle[3]];
}
view->gl_swizzle_r = to_gl_swizzle(swizzle[0]);
view->gl_swizzle_g = to_gl_swizzle(swizzle[1]);
view->gl_swizzle_b = to_gl_swizzle(swizzle[2]);
view->gl_swizzle_a = to_gl_swizzle(swizzle[3]);
if (has_feature(feat_texture_view) && !view->texture->is_buffer) {
enum pipe_format format; enum pipe_format format;
bool needs_view = false; bool needs_view = false;
@ -1835,50 +1867,27 @@ int vrend_create_sampler_view(struct vrend_context *ctx,
GLenum internalformat = tex_conv_table[format].internalformat; GLenum internalformat = tex_conv_table[format].internalformat;
unsigned base_layer = view->val0 & 0xffff; unsigned base_layer = view->val0 & 0xffff;
unsigned max_layer = (view->val0 >> 16) & 0xffff; unsigned max_layer = (view->val0 >> 16) & 0xffff;
view->cur_base = view->val1 & 0xff; int base_level = view->val1 & 0xff;
view->cur_max = (view->val1 >> 8) & 0xff; int max_level = (view->val1 >> 8) & 0xff;
glTextureView(view->id, view->target, view->texture->id, internalformat, glTextureView(view->id, view->target, view->texture->id, internalformat,
view->cur_base, (view->cur_max - view->cur_base) + 1, base_level, (max_level - base_level) + 1,
base_layer, max_layer - base_layer + 1); base_layer, max_layer - base_layer + 1);
}
}
view->srgb_decode = GL_DECODE_EXT;
if (view->format != view->texture->base.format) {
if (util_format_is_srgb(view->texture->base.format) &&
!util_format_is_srgb(view->format))
view->srgb_decode = GL_SKIP_DECODE_EXT;
}
if (!(util_format_has_alpha(view->format) || util_format_is_depth_or_stencil(view->format))) {
if (swizzle[0] == PIPE_SWIZZLE_ALPHA)
swizzle[0] = PIPE_SWIZZLE_ONE;
if (swizzle[1] == PIPE_SWIZZLE_ALPHA)
swizzle[1] = PIPE_SWIZZLE_ONE;
if (swizzle[2] == PIPE_SWIZZLE_ALPHA)
swizzle[2] = PIPE_SWIZZLE_ONE;
if (swizzle[3] == PIPE_SWIZZLE_ALPHA)
swizzle[3] = PIPE_SWIZZLE_ONE;
}
if (tex_conv_table[view->format].flags & VIRGL_BIND_NEED_SWIZZLE) { glBindTexture(view->texture->target, view->id);
if (swizzle[0] <= PIPE_SWIZZLE_ALPHA) glTexParameteri(view->texture->target, GL_TEXTURE_BASE_LEVEL, base_level);
swizzle[0] = tex_conv_table[view->format].swizzle[swizzle[0]]; glTexParameteri(view->texture->target, GL_TEXTURE_MAX_LEVEL, max_level);
if (swizzle[1] <= PIPE_SWIZZLE_ALPHA) glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_R, view->gl_swizzle_r);
swizzle[1] = tex_conv_table[view->format].swizzle[swizzle[1]]; glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_G, view->gl_swizzle_g);
if (swizzle[2] <= PIPE_SWIZZLE_ALPHA) glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_B, view->gl_swizzle_b);
swizzle[2] = tex_conv_table[view->format].swizzle[swizzle[2]]; glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_A, view->gl_swizzle_a);
if (swizzle[3] <= PIPE_SWIZZLE_ALPHA) if (util_format_is_srgb(view->texture->base.format) &&
swizzle[3] = tex_conv_table[view->format].swizzle[swizzle[3]]; has_feature(feat_texture_srgb_decode)) {
glTexParameteri(view->texture->target, GL_TEXTURE_SRGB_DECODE_EXT,
view->srgb_decode);
}
}
} }
view->gl_swizzle_r = to_gl_swizzle(swizzle[0]);
view->gl_swizzle_g = to_gl_swizzle(swizzle[1]);
view->gl_swizzle_b = to_gl_swizzle(swizzle[2]);
view->gl_swizzle_a = to_gl_swizzle(swizzle[3]);
view->cur_swizzle_r = view->cur_swizzle_g =
view->cur_swizzle_b = view->cur_swizzle_a = -1;
ret_handle = vrend_renderer_object_insert(ctx, view, sizeof(*view), handle, VIRGL_OBJECT_SAMPLER_VIEW); ret_handle = vrend_renderer_object_insert(ctx, view, sizeof(*view), handle, VIRGL_OBJECT_SAMPLER_VIEW);
if (ret_handle == 0) { if (ret_handle == 0) {
FREE(view); FREE(view);
@ -2566,37 +2575,41 @@ void vrend_set_single_sampler_view(struct vrend_context *ctx,
} }
} }
if (view->cur_base != (view->val1 & 0xff)) { if (view->texture->id == view->id) {
view->cur_base = view->val1 & 0xff; if (tex->cur_base != (view->val1 & 0xff)) {
glTexParameteri(view->texture->target, GL_TEXTURE_BASE_LEVEL, view->cur_base); int base_level = view->val1 & 0xff;
} glTexParameteri(view->texture->target, GL_TEXTURE_BASE_LEVEL, base_level);
if (view->cur_max != ((view->val1 >> 8) & 0xff)) { tex->cur_base = base_level;
view->cur_max = (view->val1 >> 8) & 0xff; }
glTexParameteri(view->texture->target, GL_TEXTURE_MAX_LEVEL, view->cur_max); if (tex->cur_max != ((view->val1 >> 8) & 0xff)) {
} int max_level = (view->val1 >> 8) & 0xff;
if (view->cur_swizzle_r != view->gl_swizzle_r) { glTexParameteri(view->texture->target, GL_TEXTURE_MAX_LEVEL, max_level);
glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_R, view->gl_swizzle_r); tex->cur_max = max_level;
view->cur_swizzle_r = view->gl_swizzle_r; }
} if (tex->cur_swizzle_r != view->gl_swizzle_r) {
if (view->cur_swizzle_g != view->gl_swizzle_g) { glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_R, view->gl_swizzle_r);
glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_G, view->gl_swizzle_g); tex->cur_swizzle_r = view->gl_swizzle_r;
view->cur_swizzle_g = view->gl_swizzle_g; }
} if (tex->cur_swizzle_g != view->gl_swizzle_g) {
if (view->cur_swizzle_b != view->gl_swizzle_b) { glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_G, view->gl_swizzle_g);
glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_B, view->gl_swizzle_b); tex->cur_swizzle_g = view->gl_swizzle_g;
view->cur_swizzle_b = view->gl_swizzle_b; }
} if (tex->cur_swizzle_b != view->gl_swizzle_b) {
if (view->cur_swizzle_a != view->gl_swizzle_a) { glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_B, view->gl_swizzle_b);
glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_A, view->gl_swizzle_a); tex->cur_swizzle_b = view->gl_swizzle_b;
view->cur_swizzle_a = view->gl_swizzle_a; }
} if (tex->cur_swizzle_a != view->gl_swizzle_a) {
if (view->cur_srgb_decode != view->srgb_decode && util_format_is_srgb(view->format)) { glTexParameteri(view->texture->target, GL_TEXTURE_SWIZZLE_A, view->gl_swizzle_a);
if (has_feature(feat_samplers)) tex->cur_swizzle_a = view->gl_swizzle_a;
ctx->sub->sampler_state_dirty = true; }
else if (has_feature(feat_texture_srgb_decode)) { if (tex->cur_srgb_decode != view->srgb_decode && util_format_is_srgb(tex->base.base.format)) {
glTexParameteri(view->texture->target, GL_TEXTURE_SRGB_DECODE_EXT, if (has_feature(feat_samplers))
view->srgb_decode); ctx->sub->sampler_state_dirty = true;
view->cur_srgb_decode = view->srgb_decode; else if (has_feature(feat_texture_srgb_decode)) {
glTexParameteri(view->texture->target, GL_TEXTURE_SRGB_DECODE_EXT,
view->srgb_decode);
tex->cur_srgb_decode = view->srgb_decode;
}
} }
} }
} else { } else {
@ -5822,6 +5835,9 @@ static int vrend_renderer_resource_allocate_texture(struct vrend_resource *gr,
} }
gt->state.max_lod = -1; gt->state.max_lod = -1;
gt->cur_swizzle_r = gt->cur_swizzle_g = gt->cur_swizzle_b = gt->cur_swizzle_a = -1;
gt->cur_base = -1;
gt->cur_max = 10000;
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save