fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 06:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: get outputs read from nir info

Browse source 
This is a step towards dropping the GLSL IR version of
do_set_program_inouts() in i965 and moving towards native nir support.

This is important because we want to eventually convert to nir and
use its optimisations passes before we can call this GLSL IR pass.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri 2016-10-05 15:56:21 +11:00
parent a38c809f6e
commit b526a9b708
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -31,6 +31,7 @@
*/ */
#include "compiler/nir/nir.h"
#include "main/api_exec.h" #include "main/api_exec.h"
#include "main/context.h" #include "main/context.h"
#include "main/fbobject.h" #include "main/fbobject.h"
@ -304,7 +305,7 @@ intel_update_state(struct gl_context * ctx, GLuint new_state)
/* Resolve color buffers for non-coherent framebuffer fetch. */ /* Resolve color buffers for non-coherent framebuffer fetch. */
if (!ctx->Extensions.MESA_shader_framebuffer_fetch && if (!ctx->Extensions.MESA_shader_framebuffer_fetch &&
ctx->FragmentProgram._Current && ctx->FragmentProgram._Current &&
ctx->FragmentProgram._Current->Base.OutputsRead) { ctx->FragmentProgram._Current->Base.nir->info.outputs_read) {
const struct gl_framebuffer *fb = ctx->DrawBuffer; const struct gl_framebuffer *fb = ctx->DrawBuffer;
for (unsigned i = 0; i < fb->_NumColorDrawBuffers; i++) { for (unsigned i = 0; i < fb->_NumColorDrawBuffers; i++) {

2
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -1145,7 +1145,7 @@ update_renderbuffer_read_surfaces(struct brw_context *brw)
/* BRW_NEW_FRAGMENT_PROGRAM */ /* BRW_NEW_FRAGMENT_PROGRAM */
if (!ctx->Extensions.MESA_shader_framebuffer_fetch && if (!ctx->Extensions.MESA_shader_framebuffer_fetch &&
brw->fragment_program && brw->fragment_program &&
brw->fragment_program->Base.OutputsRead) { brw->fragment_program->Base.nir->info.outputs_read) {
/* _NEW_BUFFERS */ /* _NEW_BUFFERS */
const struct gl_framebuffer *fb = ctx->DrawBuffer; const struct gl_framebuffer *fb = ctx->DrawBuffer;