Attachment 110919 Details for Bug 87371 – updated patch

[patch] updated patch

brw.patch (text/plain), 1.78 KB, created by Brian Paul on 2014-12-16 18:07:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2014-12-16 18:07:33 UTC

Size: 1.78 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
>index 6cac6d7..578d8c1 100644
>--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
>+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
>@@ -39,7 +39,6 @@ extern "C" {
> #include "program/prog_parameter.h"
> #include "program/prog_print.h"
> #include "util/register_allocate.h"
>-#include "program/sampler.h"
> #include "program/hash_table.h"
> #include "brw_context.h"
> #include "brw_eu.h"
>@@ -51,6 +50,7 @@ extern "C" {
> #include "main/uniforms.h"
> #include "brw_fs_live_variables.h"
> #include "glsl/glsl_types.h"
>+#include "program/sampler.h"
> 
> void
> fs_inst::init(enum opcode opcode, uint8_t exec_size, const fs_reg &dst,
>diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
>index 399e772..bd9345e 100644
>--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
>+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
>@@ -37,7 +37,6 @@ extern "C" {
> #include "program/prog_print.h"
> #include "program/prog_optimize.h"
> #include "util/register_allocate.h"
>-#include "program/sampler.h"
> #include "program/hash_table.h"
> #include "brw_context.h"
> #include "brw_eu.h"
>@@ -48,6 +47,8 @@ extern "C" {
> #include "main/uniforms.h"
> #include "glsl/glsl_types.h"
> #include "glsl/ir_optimization.h"
>+#include "program/sampler.h"
>+
> 
> fs_reg *
> fs_visitor::emit_vs_system_value(enum brw_reg_type type, int location)
>diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
>index 7238788..09d79c8 100644
>--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
>+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
>@@ -24,9 +24,7 @@
> #include "brw_vec4.h"
> #include "brw_cfg.h"
> #include "glsl/ir_uniform.h"
>-extern "C" {
> #include "program/sampler.h"
>-}
> 
> namespace brw {
>

Actions: View | Splinter Review

Attachments on bug 87371: 110918 | 110919

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.