summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2013-11-14 10:36:12 -0800
committerMatt Turner <[email protected]>2013-11-15 23:31:42 -0800
commite133c0103d4336c47911e89cc8a17a1c78bfdbb8 (patch)
tree59bda92b8d3b89a9683b033104be8da5754a1e37
parentb570c4229fe9c621b56bb9475d77a344039444d4 (diff)
i965: Assert that IF with cmod is Gen6 only.
Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp4
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index f89390c346c..795e01efdfb 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -193,11 +193,11 @@ fs_visitor::IF(uint32_t predicate)
return inst;
}
-/** Gen6+ IF with embedded comparison. */
+/** Gen6 IF with embedded comparison. */
fs_inst *
fs_visitor::IF(fs_reg src0, fs_reg src1, uint32_t condition)
{
- assert(brw->gen >= 6);
+ assert(brw->gen == 6);
fs_inst *inst = new(mem_ctx) fs_inst(BRW_OPCODE_IF,
reg_null_d, src0, src1);
inst->conditional_mod = condition;
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index a036e2dbb06..423f69301e8 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -177,11 +177,11 @@ vec4_visitor::IF(uint32_t predicate)
return inst;
}
-/** Gen6+ IF with embedded comparison. */
+/** Gen6 IF with embedded comparison. */
vec4_instruction *
vec4_visitor::IF(src_reg src0, src_reg src1, uint32_t condition)
{
- assert(brw->gen >= 6);
+ assert(brw->gen == 6);
vec4_instruction *inst;
Y, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef R300_SCREEN_H #define R300_SCREEN_H #include "r300_chipset.h" #include "radeon/radeon_winsys.h" #include "pipe/p_screen.h" #include "util/slab.h" #include "os/os_thread.h" #include <stdio.h> struct r300_screen { /* Parent class */ struct pipe_screen screen; struct radeon_winsys *rws; /* Chipset info and capabilities. */ struct radeon_info info; struct r300_capabilities caps; /** Combination of DBG_xxx flags */ unsigned debug; struct slab_parent_pool pool_transfers; /* The MSAA texture with CMASK access; */ struct pipe_resource *cmask_resource; mtx_t cmask_mutex; }; /* Convenience cast wrappers. */ static inline struct r300_screen* r300_screen(struct pipe_screen* screen) { return (struct r300_screen*)screen; } static inline struct radeon_winsys * radeon_winsys(struct pipe_screen *screen) { return r300_screen(screen)->rws; } /* Debug functionality. */ /** * Debug flags to disable/enable certain groups of debugging outputs. * * \note These may be rather coarse, and the grouping may be impractical. * If you find, while debugging the driver, that a different grouping * of these flags would be beneficial, just feel free to change them * but make sure to update the documentation in r300_debug.c to reflect * those changes. */ /*@{*/ /* Logging. */ #define DBG_PSC (1 << 0) #define DBG_FP (1 << 1) #define DBG_VP (1 << 2) #define DBG_SWTCL (1 << 3) #define DBG_DRAW (1 << 4) #define DBG_TEX (1 << 5) #define DBG_TEXALLOC (1 << 6) #define DBG_RS (1 << 7) #define DBG_FB (1 << 8) #define DBG_RS_BLOCK (1 << 9) #define DBG_CBZB (1 << 10) #define DBG_HYPERZ (1 << 11) #define DBG_SCISSOR (1 << 12) #define DBG_INFO (1 << 13) #define DBG_MSAA (1 << 14) /* Features. */ #define DBG_ANISOHQ (1 << 16) #define DBG_NO_TILING (1 << 17) #define DBG_NO_IMMD (1 << 18) #define DBG_NO_OPT (1 << 19) #define DBG_NO_CBZB (1 << 20) #define DBG_NO_ZMASK (1 << 21) #define DBG_NO_HIZ (1 << 22) #define DBG_NO_CMASK (1 << 23) /* Statistics. */ #define DBG_P_STAT (1 << 25) /*@}*/ static inline boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags) { return (screen->debug & flags) ? TRUE : FALSE; } static inline void SCREEN_DBG(struct r300_screen * screen, unsigned flags, const char * fmt, ...) { if (SCREEN_DBG_ON(screen, flags)) { va_list va; va_start(va, fmt); vfprintf(stderr, fmt, va); va_end(va); } } void r300_init_debug(struct r300_screen* ctx); void r300_init_screen_resource_functions(struct r300_screen *r300screen); #endif /* R300_SCREEN_H */