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/master' into pipe-video
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_sf_state.c
diff --git
a/src/mesa/drivers/dri/i965/brw_sf_state.c
b/src/mesa/drivers/dri/i965/brw_sf_state.c
index 914f275cc67c9f500d9e467b2161c75002a95da5..bd3a21ed9e2fc9b968c083fc6eeff16c47bb0ab2 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_sf_state.c
+++ b/
src/mesa/drivers/dri/i965/brw_sf_state.c
@@
-38,7
+38,7
@@
static void upload_sf_vp(struct brw_context *brw)
{
static void upload_sf_vp(struct brw_context *brw)
{
-
GL
context *ctx = &brw->intel.ctx;
+
struct gl_
context *ctx = &brw->intel.ctx;
const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
struct brw_sf_viewport sfv;
GLfloat y_scale, y_bias;
const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
struct brw_sf_viewport sfv;
GLfloat y_scale, y_bias;
@@
-139,7
+139,7
@@
struct brw_sf_unit_key {
static void
sf_unit_populate_key(struct brw_context *brw, struct brw_sf_unit_key *key)
{
static void
sf_unit_populate_key(struct brw_context *brw, struct brw_sf_unit_key *key)
{
-
GL
context *ctx = &brw->intel.ctx;
+
struct gl_
context *ctx = &brw->intel.ctx;
memset(key, 0, sizeof(*key));
/* CACHE_NEW_SF_PROG */
memset(key, 0, sizeof(*key));
/* CACHE_NEW_SF_PROG */
@@
-210,10
+210,10
@@
sf_unit_create_from_key(struct brw_context *brw, struct brw_sf_unit_key *key,
sf.thread4.max_threads = MIN2(chipset_max_threads, key->nr_urb_entries) - 1;
sf.thread4.max_threads = MIN2(chipset_max_threads, key->nr_urb_entries) - 1;
- if (
INTEL_DEBUG & DEBUG_SINGLE_THREAD
)
+ if (
unlikely(INTEL_DEBUG & DEBUG_SINGLE_THREAD)
)
sf.thread4.max_threads = 0;
sf.thread4.max_threads = 0;
- if (
INTEL_DEBUG & DEBUG_STATS
)
+ if (
unlikely(INTEL_DEBUG & DEBUG_STATS)
)
sf.thread4.stats_enable = 1;
/* CACHE_NEW_SF_VP */
sf.thread4.stats_enable = 1;
/* CACHE_NEW_SF_VP */