projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freedreno/a6xx: Add ARB_depth_clamp and separate clamp support.
[mesa.git]
/
src
/
gallium
/
drivers
/
i915
/
i915_state_immediate.c
diff --git
a/src/gallium/drivers/i915/i915_state_immediate.c
b/src/gallium/drivers/i915/i915_state_immediate.c
index c4a6cae1beb9fe07060ec3a9ee1d26ef0172c4e7..14566a4bec30096219fd3f159d364bcc1f355617 100644
(file)
--- a/
src/gallium/drivers/i915/i915_state_immediate.c
+++ b/
src/gallium/drivers/i915/i915_state_immediate.c
@@
-168,11
+168,13
@@
static void upload_S6(struct i915_context *i915)
/* I915_NEW_BLEND
*/
/* I915_NEW_BLEND
*/
- LIS6 |= i915->blend->LIS6;
+ if (i915->blend)
+ LIS6 |= i915->blend->LIS6;
/* I915_NEW_DEPTH
*/
/* I915_NEW_DEPTH
*/
- LIS6 |= i915->depth_stencil->depth_LIS6;
+ if (i915->depth_stencil)
+ LIS6 |= i915->depth_stencil->depth_LIS6;
set_immediate(i915, I915_IMMEDIATE_S6, LIS6);
}
set_immediate(i915, I915_IMMEDIATE_S6, LIS6);
}
@@
-222,7
+224,7
@@
static void update_immediate(struct i915_context *i915)
{
int i;
{
int i;
- for (i = 0; i <
Elements
(atoms); i++)
+ for (i = 0; i <
ARRAY_SIZE
(atoms); i++)
if (i915->dirty & atoms[i]->dirty)
atoms[i]->update(i915);
}
if (i915->dirty & atoms[i]->dirty)
atoms[i]->update(i915);
}