projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/miptree: Check tex image allocation failures
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
i915_vtbl.c
diff --git
a/src/mesa/drivers/dri/i915/i915_vtbl.c
b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 706e0c3d6a2a2aa3ec24f56cba9752e7e569bc90..6a0a121856d7943a9f3309b774ebd753a5b03102 100644
(file)
--- a/
src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/
src/mesa/drivers/dri/i915/i915_vtbl.c
@@
-31,7
+31,6
@@
#include "main/mtypes.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/imports.h"
#include "main/macros.h"
-#include "main/colormac.h"
#include "main/renderbuffer.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "main/framebuffer.h"
@@
-177,7
+176,7
@@
i915_emit_invarient_state(struct intel_context *intel)
{
BATCH_LOCALS;
{
BATCH_LOCALS;
- BEGIN_BATCH(1
7
);
+ BEGIN_BATCH(1
5
);
OUT_BATCH(_3DSTATE_AA_CMD |
AA_LINE_ECAAR_WIDTH_ENABLE |
OUT_BATCH(_3DSTATE_AA_CMD |
AA_LINE_ECAAR_WIDTH_ENABLE |
@@
-201,11
+200,6
@@
i915_emit_invarient_state(struct intel_context *intel)
CSB_TCB(3, 3) |
CSB_TCB(4, 4) | CSB_TCB(5, 5) | CSB_TCB(6, 6) | CSB_TCB(7, 7));
CSB_TCB(3, 3) |
CSB_TCB(4, 4) | CSB_TCB(5, 5) | CSB_TCB(6, 6) | CSB_TCB(7, 7));
- /* Need to initialize this to zero.
- */
- OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(3) | (0));
- OUT_BATCH(0);
-
OUT_BATCH(_3DSTATE_SCISSOR_RECT_0_CMD);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(_3DSTATE_SCISSOR_RECT_0_CMD);
OUT_BATCH(0);
OUT_BATCH(0);
@@
-356,7
+350,7
@@
i915_emit_state(struct intel_context *intel)
assert(get_dirty(state) == 0);
if (INTEL_DEBUG & DEBUG_STATE)
assert(get_dirty(state) == 0);
if (INTEL_DEBUG & DEBUG_STATE)
- fprintf(stderr, "%s dirty: %x\n", __
FUNCTION
__, dirty);
+ fprintf(stderr, "%s dirty: %x\n", __
func
__, dirty);
if (dirty & I915_UPLOAD_INVARIENT) {
if (INTEL_DEBUG & DEBUG_STATE)
if (dirty & I915_UPLOAD_INVARIENT) {
if (INTEL_DEBUG & DEBUG_STATE)
@@
-732,9
+726,9
@@
i915_update_draw_buffer(struct intel_context *intel)
*/
if (ctx->NewState & _NEW_BUFFERS) {
/* this updates the DrawBuffer->_NumColorDrawBuffers fields, etc */
*/
if (ctx->NewState & _NEW_BUFFERS) {
/* this updates the DrawBuffer->_NumColorDrawBuffers fields, etc */
- _mesa_update_framebuffer(ctx);
+ _mesa_update_framebuffer(ctx
, ctx->ReadBuffer, ctx->DrawBuffer
);
/* this updates the DrawBuffer's Width/Height if it's a FBO */
/* this updates the DrawBuffer's Width/Height if it's a FBO */
- _mesa_update_draw_buffer_bounds(ctx);
+ _mesa_update_draw_buffer_bounds(ctx
, ctx->DrawBuffer
);
}
if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
}
if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {