projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
i915_state.c
diff --git
a/src/mesa/drivers/dri/i915/i915_state.c
b/src/mesa/drivers/dri/i915/i915_state.c
index 9d7a9e1dfeaa72822d19f727a6db401019b8a393..91b228d52b9e62a677970b3e9dc3747bc9b2f6f7 100644
(file)
--- a/
src/mesa/drivers/dri/i915/i915_state.c
+++ b/
src/mesa/drivers/dri/i915/i915_state.c
@@
-374,7
+374,7
@@
intelCalcViewport(GLcontext * ctx)
else {
/* window buffer, y=0=top */
yScale = -1.0;
else {
/* window buffer, y=0=top */
yScale = -1.0;
- yBias =
(intel->driDrawable) ? intel->driDrawable->h : 0.0F
;
+ yBias =
ctx->DrawBuffer->Height
;
}
m[MAT_SX] = v[MAT_SX];
}
m[MAT_SX] = v[MAT_SX];
@@
-1157,7
+1157,4
@@
i915InitState(struct i915_context *i915)
i915_init_packets(i915);
_mesa_init_driver_state(ctx);
i915_init_packets(i915);
_mesa_init_driver_state(ctx);
-
- memcpy(&i915->initial, &i915->state, sizeof(i915->state));
- i915->current = &i915->state;
}
}