projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel: Replace IS_G4X() across the driver with context structure usage.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_clip_util.c
diff --git
a/src/mesa/drivers/dri/i965/brw_clip_util.c
b/src/mesa/drivers/dri/i965/brw_clip_util.c
index 5a73abdfee9d994eaed52b2d5d2d0ef34e1efb29..86fed59fa4b89dfbc90b7747a3407d72d7a38b95 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_clip_util.c
+++ b/
src/mesa/drivers/dri/i965/brw_clip_util.c
@@
-135,6
+135,7
@@
void brw_clip_interp_vertex( struct brw_clip_compile *c,
GLboolean force_edgeflag)
{
struct brw_compile *p = &c->func;
GLboolean force_edgeflag)
{
struct brw_compile *p = &c->func;
+ struct intel_context *intel = &p->brw->intel;
struct brw_reg tmp = get_tmp(c);
GLuint i;
struct brw_reg tmp = get_tmp(c);
GLuint i;
@@
-142,7
+143,7
@@
void brw_clip_interp_vertex( struct brw_clip_compile *c,
*/
/*
* After CLIP stage, only first 256 bits of the VUE are read
*/
/*
* After CLIP stage, only first 256 bits of the VUE are read
- * back on I
GDNG
, so needn't change it
+ * back on I
ronlake
, so needn't change it
*/
brw_copy_indirect_to_indirect(p, dest_ptr, v0_ptr, 1);
*/
brw_copy_indirect_to_indirect(p, dest_ptr, v0_ptr, 1);
@@
-151,7
+152,7
@@
void brw_clip_interp_vertex( struct brw_clip_compile *c,
for (i = 0; i < c->nr_attrs; i++) {
GLuint delta = i*16 + 32;
for (i = 0; i < c->nr_attrs; i++) {
GLuint delta = i*16 + 32;
- if (
BRW_IS_IGDNG(p->brw)
)
+ if (
intel->is_ironlake
)
delta = i * 16 + 32 * 3;
if (delta == c->offset[VERT_RESULT_EDGE]) {
delta = i * 16 + 32 * 3;
if (delta == c->offset[VERT_RESULT_EDGE]) {
@@
-185,7
+186,7
@@
void brw_clip_interp_vertex( struct brw_clip_compile *c,
if (i & 1) {
GLuint delta = i*16 + 32;
if (i & 1) {
GLuint delta = i*16 + 32;
- if (
BRW_IS_IGDNG(p->brw)
)
+ if (
intel->is_ironlake
)
delta = i * 16 + 32 * 3;
brw_MOV(p, deref_4f(dest_ptr, delta), brw_imm_f(0));
delta = i * 16 + 32 * 3;
brw_MOV(p, deref_4f(dest_ptr, delta), brw_imm_f(0));
@@
-359,7
+360,9
@@
void brw_clip_init_clipmask( struct brw_clip_compile *c )
void brw_clip_ff_sync(struct brw_clip_compile *c)
{
void brw_clip_ff_sync(struct brw_clip_compile *c)
{
- if (c->need_ff_sync) {
+ struct intel_context *intel = &c->func.brw->intel;
+
+ if (intel->needs_ff_sync) {
struct brw_compile *p = &c->func;
struct brw_instruction *need_ff_sync;
struct brw_compile *p = &c->func;
struct brw_instruction *need_ff_sync;
@@
-388,7
+391,9
@@
void brw_clip_ff_sync(struct brw_clip_compile *c)
void brw_clip_init_ff_sync(struct brw_clip_compile *c)
{
void brw_clip_init_ff_sync(struct brw_clip_compile *c)
{
- if (c->need_ff_sync) {
+ struct intel_context *intel = &c->func.brw->intel;
+
+ if (intel->needs_ff_sync) {
struct brw_compile *p = &c->func;
brw_MOV(p, c->reg.ff_sync, brw_imm_ud(0));
struct brw_compile *p = &c->func;
brw_MOV(p, c->reg.ff_sync, brw_imm_ud(0));