[Mesa-dev] [PATCH 47/47] (0044b) Patch fixes

[Shaofeng Tang]

From: Kevin Rogovin <kevin.rogovin at intel.com>

Change-Id: Ie24a3406b0f6330dc07426deddfbecadd281ea80
---
 Notes.txt                     | 3 +++
 src/intel/blorp/blorp_blit.c  | 2 +-
 src/intel/compiler/brw_fs.cpp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Notes.txt b/Notes.txt
index dcb394f..cd62001 100644
--- a/Notes.txt
+++ b/Notes.txt
@@ -12,6 +12,9 @@ Patch 0018 i965/fs: Rework FB write header setup for SIMD32 and better schedulin
 Patch 0032 965/fs: Implement 32-wide FS payload setup on Gen6+.
    Needed to change nir->info->XXX to nir->info.XXX in fs_vistor::setup_fs_payload_gen6().
 
+Patch 44 HACK: i965/fs: Enable SIMD32 codegen for BLORP fragment shaders.
+   Needed to change shader->info->XXX to shader->info.XXX
+
 
 Patch 0042 State Setup for SIMD32 fragmetn shaders
     This patch had to be completely rewritten since the state uploads
diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index fa02ac2..189fef0 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -1121,7 +1121,7 @@ brw_blorp_build_nir_shader(struct blorp_context *blorp, void *mem_ctx,
 
    nir_builder b;
    nir_builder_init_simple_shader(&b, mem_ctx, MESA_SHADER_FRAGMENT, NULL);
-   b.shader->info->name = ralloc_strdup(b.shader, "BLORP-blit");
+   b.shader->info.name = ralloc_strdup(b.shader, "BLORP-blit");
 
    struct brw_blorp_blit_vars v;
    brw_blorp_blit_vars_init(&b, &v, key);
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index f2763ff..c847acd 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -7171,7 +7171,7 @@ brw_compile_fs(const struct brw_compiler *compiler, void *log_data,
    if (v8.max_dispatch_width >= 32 && !use_rep_send &&
        compiler->devinfo->gen >= 6 &&
        (INTEL_DEBUG & DEBUG_DO32 ||
-        strncmp(src_shader->info->name, "BLORP", 5) == 0)) {
+        strncmp(src_shader->info.name, "BLORP", 5) == 0)) {
       /* Try a SIMD32 compile */
       fs_visitor v32(compiler, log_data, mem_ctx, key,
                      &prog_data->base, prog, shader, 32,
-- 
2.7.4