Re: [Mesa-dev] [PATCH 4/4] i965/fs: Remove is_valid_3src().

2014-11-13 Thread Anuj Phogat 
On Wed, Nov 12, 2014 at 11:15 AM, Matt Turner matts...@gmail.com wrote:

 ---
  src/mesa/drivers/dri/i965/brw_fs.cpp | 6 --
  src/mesa/drivers/dri/i965/brw_fs.h   | 1 -
  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 2 +-
  3 files changed, 1 insertion(+), 8 deletions(-)

 diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp 
 b/src/mesa/drivers/dri/i965/brw_fs.cpp
 index 7003691..9196af9 100644
 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
 +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
 @@ -622,12 +622,6 @@ fs_reg::is_contiguous() const
 return stride == 1;
  }

 -bool
 -fs_reg::is_valid_3src() const
 -{
 -   return file == GRF || file == UNIFORM;
 -}
 -
  int
  fs_visitor::type_size(const struct glsl_type *type)
  {
 diff --git a/src/mesa/drivers/dri/i965/brw_fs.h 
 b/src/mesa/drivers/dri/i965/brw_fs.h
 index 0dae800..9e1dddc 100644
 --- a/src/mesa/drivers/dri/i965/brw_fs.h
 +++ b/src/mesa/drivers/dri/i965/brw_fs.h
 @@ -83,7 +83,6 @@ public:
 fs_reg(fs_visitor *v, const struct glsl_type *type);

 bool equals(const fs_reg r) const;
 -   bool is_valid_3src() const;
 bool is_contiguous() const;

 /** Smear a channel of the reg to all channels. */
 diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp 
 b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
 index ce4d8c8..f112466 100644
 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
 +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
 @@ -514,7 +514,7 @@ fs_visitor::visit(ir_expression *ir)
  ir-operands[operand]-fprint(stderr);
   fprintf(stderr, \n);
}
 -  assert(this-result.is_valid_3src());
 +  assert(this-result.file == GRF || this-result.file == UNIFORM);
op[operand] = this-result;

/* Matrix expression operands should have been broken down to vector
 --
 2.0.4

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Series is Reviewed-by: Anuj Phogat anuj.pho...@gmail.com
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 4/4] i965/fs: Remove is_valid_3src().

2014-11-12 Thread Matt Turner 
---
 src/mesa/drivers/dri/i965/brw_fs.cpp | 6 --
 src/mesa/drivers/dri/i965/brw_fs.h   | 1 -
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp 
b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 7003691..9196af9 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -622,12 +622,6 @@ fs_reg::is_contiguous() const
return stride == 1;
 }
 
-bool
-fs_reg::is_valid_3src() const
-{
-   return file == GRF || file == UNIFORM;
-}
-
 int
 fs_visitor::type_size(const struct glsl_type *type)
 {
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h 
b/src/mesa/drivers/dri/i965/brw_fs.h
index 0dae800..9e1dddc 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -83,7 +83,6 @@ public:
fs_reg(fs_visitor *v, const struct glsl_type *type);
 
bool equals(const fs_reg r) const;
-   bool is_valid_3src() const;
bool is_contiguous() const;
 
/** Smear a channel of the reg to all channels. */
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp 
b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index ce4d8c8..f112466 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -514,7 +514,7 @@ fs_visitor::visit(ir_expression *ir)
 ir-operands[operand]-fprint(stderr);
  fprintf(stderr, \n);
   }
-  assert(this-result.is_valid_3src());
+  assert(this-result.file == GRF || this-result.file == UNIFORM);
   op[operand] = this-result;
 
   /* Matrix expression operands should have been broken down to vector
-- 
2.0.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev