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

vrend: pass sub_context directly to draw_bind_ssbo_shader

Browse Source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
macos/master
Gert Wollny 4 years ago
parent bd7972b403
commit b32ff0f72e
1 changed files with 9 additions and 9 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. 18
      src/vrend_renderer.c

18
src/vrend_renderer.c
Unescape View File

@ -4234,7 +4234,7 @@ static void vrend_draw_bind_const_shader(struct vrend_sub_context *sub_ctx,
} }
} }
static void vrend_draw_bind_ssbo_shader(struct vrend_context *ctx, int shader_type) static void vrend_draw_bind_ssbo_shader(struct vrend_sub_context *sub_ctx, int shader_type)
{ {
uint32_t mask; uint32_t mask;
struct vrend_ssbo *ssbo; struct vrend_ssbo *ssbo;
@ -4244,23 +4244,23 @@ static void vrend_draw_bind_ssbo_shader(struct vrend_context *ctx, int shader_ty
if (!has_feature(feat_ssbo)) if (!has_feature(feat_ssbo))
return; return;
if (!ctx->sub->prog->ssbo_locs[shader_type]) if (!sub_ctx->prog->ssbo_locs[shader_type])
return; return;
if (!ctx->sub->ssbo_used_mask[shader_type]) if (!sub_ctx->ssbo_used_mask[shader_type])
return; return;
mask = ctx->sub->ssbo_used_mask[shader_type]; mask = sub_ctx->ssbo_used_mask[shader_type];
while (mask) { while (mask) {
i = u_bit_scan(&mask); i = u_bit_scan(&mask);
ssbo = &ctx->sub->ssbo[shader_type][i]; ssbo = &sub_ctx->ssbo[shader_type][i];
res = (struct vrend_resource *)ssbo->res; res = (struct vrend_resource *)ssbo->res;
glBindBufferRange(GL_SHADER_STORAGE_BUFFER, i, res->id, glBindBufferRange(GL_SHADER_STORAGE_BUFFER, i, res->id,
ssbo->buffer_offset, ssbo->buffer_size); ssbo->buffer_offset, ssbo->buffer_size);
if (ctx->sub->prog->ssbo_locs[shader_type][i] != GL_INVALID_INDEX) { if (sub_ctx->prog->ssbo_locs[shader_type][i] != GL_INVALID_INDEX) {
if (!vrend_state.use_gles) if (!vrend_state.use_gles)
glShaderStorageBlockBinding(ctx->sub->prog->id, ctx->sub->prog->ssbo_locs[shader_type][i], i); glShaderStorageBlockBinding(sub_ctx->prog->id, sub_ctx->prog->ssbo_locs[shader_type][i], i);
else else
debug_printf("glShaderStorageBlockBinding not supported on gles \n"); debug_printf("glShaderStorageBlockBinding not supported on gles \n");
} }
@ -4367,7 +4367,7 @@ static void vrend_draw_bind_objects(struct vrend_context *ctx, bool new_program)
next_sampler_id = vrend_draw_bind_samplers_shader(ctx->sub, shader_type, next_sampler_id = vrend_draw_bind_samplers_shader(ctx->sub, shader_type,
next_sampler_id); next_sampler_id);
vrend_draw_bind_images_shader(ctx->sub, shader_type); vrend_draw_bind_images_shader(ctx->sub, shader_type);
vrend_draw_bind_ssbo_shader(ctx, shader_type); vrend_draw_bind_ssbo_shader(ctx->sub, shader_type);
} }
vrend_draw_bind_abo_shader(ctx); vrend_draw_bind_abo_shader(ctx);
@ -4843,7 +4843,7 @@ void vrend_launch_grid(struct vrend_context *ctx,
vrend_draw_bind_const_shader(ctx->sub, PIPE_SHADER_COMPUTE, new_program); vrend_draw_bind_const_shader(ctx->sub, PIPE_SHADER_COMPUTE, new_program);
vrend_draw_bind_samplers_shader(ctx->sub, PIPE_SHADER_COMPUTE, 0); vrend_draw_bind_samplers_shader(ctx->sub, PIPE_SHADER_COMPUTE, 0);
vrend_draw_bind_images_shader(ctx->sub, PIPE_SHADER_COMPUTE); vrend_draw_bind_images_shader(ctx->sub, PIPE_SHADER_COMPUTE);
vrend_draw_bind_ssbo_shader(ctx, PIPE_SHADER_COMPUTE); vrend_draw_bind_ssbo_shader(ctx->sub, PIPE_SHADER_COMPUTE);
vrend_draw_bind_abo_shader(ctx); vrend_draw_bind_abo_shader(ctx);
if (indirect_handle) { if (indirect_handle) {

Write Preview
Loading…
Cancel
Save