projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/7.8'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_clip_state.c
diff --git
a/src/mesa/drivers/dri/i965/brw_clip_state.c
b/src/mesa/drivers/dri/i965/brw_clip_state.c
index 234b3744bfc6717e986b8c41d2db72ec1992b8f3..d78f3616d6fff79e6148ed8bef3a239eca2c97e6 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_clip_state.c
+++ b/
src/mesa/drivers/dri/i965/brw_clip_state.c
@@
-32,7
+32,6
@@
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
#include "brw_context.h"
#include "brw_state.h"
#include "brw_defines.h"
-#include "main/macros.h"
struct brw_clip_unit_key {
unsigned int total_grf;
struct brw_clip_unit_key {
unsigned int total_grf;
@@
-74,6
+73,7
@@
static dri_bo *
clip_unit_create_from_key(struct brw_context *brw,
struct brw_clip_unit_key *key)
{
clip_unit_create_from_key(struct brw_context *brw,
struct brw_clip_unit_key *key)
{
+ struct intel_context *intel = &brw->intel;
struct brw_clip_unit_state clip;
dri_bo *bo;
struct brw_clip_unit_state clip;
dri_bo *bo;
@@
-102,10
+102,10
@@
clip_unit_create_from_key(struct brw_context *brw,
*/
assert(key->nr_urb_entries % 2 == 0);
*/
assert(key->nr_urb_entries % 2 == 0);
- /* Although up to 16 concurrent Clip threads are allowed on I
GDNG,
+ /* Although up to 16 concurrent Clip threads are allowed on I
ronlake,
* only 2 threads can output VUEs at a time.
*/
* only 2 threads can output VUEs at a time.
*/
- if (
BRW_IS_IGDNG(brw)
)
+ if (
intel->gen == 5
)
clip.thread4.max_threads = 16 - 1;
else
clip.thread4.max_threads = 2 - 1;
clip.thread4.max_threads = 16 - 1;
else
clip.thread4.max_threads = 2 - 1;
@@
-130,7
+130,7
@@
clip_unit_create_from_key(struct brw_context *brw,
clip.clip5.api_mode = BRW_CLIP_API_OGL;
clip.clip5.clip_mode = key->clip_mode;
clip.clip5.api_mode = BRW_CLIP_API_OGL;
clip.clip5.clip_mode = key->clip_mode;
- if (
BRW_IS_G4X(brw)
)
+ if (
intel->is_g4x
)
clip.clip5.negative_w_clip_test = 1;
clip.clip6.clipper_viewport_state_ptr = 0;
clip.clip5.negative_w_clip_test = 1;
clip.clip6.clipper_viewport_state_ptr = 0;
@@
-142,8
+142,7
@@
clip_unit_create_from_key(struct brw_context *brw,
bo = brw_upload_cache(&brw->cache, BRW_CLIP_UNIT,
key, sizeof(*key),
&brw->clip.prog_bo, 1,
bo = brw_upload_cache(&brw->cache, BRW_CLIP_UNIT,
key, sizeof(*key),
&brw->clip.prog_bo, 1,
- &clip, sizeof(clip),
- NULL, NULL);
+ &clip, sizeof(clip));
/* Emit clip program relocation */
assert(brw->clip.prog_bo);
/* Emit clip program relocation */
assert(brw->clip.prog_bo);