shader: move debug output to end of shader construction

This will make things easier in a later patch.

Suggested by Gert.

Reviewed-By: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
macos/master
Dave Airlie 6 years ago
parent d8ab0ede3b
commit fb71f03c99
  1. 4
      src/vrend_shader.c

@ -5047,8 +5047,6 @@ char *vrend_convert_shader(struct vrend_context *rctx,
memcpy(glsl_final + strbuf_get_len(&ctx.glsl_hdr), ctx.glsl_main.buf, strbuf_get_len(&ctx.glsl_main)); memcpy(glsl_final + strbuf_get_len(&ctx.glsl_hdr), ctx.glsl_main.buf, strbuf_get_len(&ctx.glsl_main));
glsl_final[strbuf_get_len(&ctx.glsl_hdr) + strbuf_get_len(&ctx.glsl_main)] = '\0'; glsl_final[strbuf_get_len(&ctx.glsl_hdr) + strbuf_get_len(&ctx.glsl_main)] = '\0';
VREND_DEBUG(dbg_shader_glsl, rctx, "GLSL: %s\n", glsl_final);
free(ctx.temp_ranges); free(ctx.temp_ranges);
strbuf_free(&ctx.glsl_main); strbuf_free(&ctx.glsl_main);
strbuf_free(&ctx.glsl_hdr); strbuf_free(&ctx.glsl_hdr);
@ -5106,6 +5104,8 @@ char *vrend_convert_shader(struct vrend_context *rctx,
free(sinfo->image_arrays); free(sinfo->image_arrays);
sinfo->image_arrays = ctx.image_arrays; sinfo->image_arrays = ctx.image_arrays;
sinfo->num_image_arrays = ctx.num_image_arrays; sinfo->num_image_arrays = ctx.num_image_arrays;
VREND_DEBUG(dbg_shader_glsl, rctx, "GLSL: %s\n", glsl_final);
return glsl_final; return glsl_final;
fail: fail:
strbuf_free(&ctx.glsl_main); strbuf_free(&ctx.glsl_main);

Loading…
Cancel
Save