projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pipe-video' of git://anongit.freedesktop.org/~deathsimple/xvmc-r600...
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
i830_texblend.c
diff --git
a/src/mesa/drivers/dri/i915/i830_texblend.c
b/src/mesa/drivers/dri/i915/i830_texblend.c
index 3f64be8c962a0bcf2fde681f33f94309927365c1..fec86c56fdc576670a7904c91a62610acccd9688 100644
(file)
--- a/
src/mesa/drivers/dri/i915/i830_texblend.c
+++ b/
src/mesa/drivers/dri/i915/i830_texblend.c
@@
-440,7
+440,7
@@
emit_passthrough(struct i830_context *i830)
void
i830EmitTextureBlend(struct i830_context *i830)
{
-
GL
context *ctx = &i830->intel.ctx;
+
struct gl_
context *ctx = &i830->intel.ctx;
GLuint unit, last_stage = 0, blendunit = 0;
I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND_ALL, GL_FALSE);