summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2013-06-21 09:26:01 -0700
committerKenneth Graunke <[email protected]>2013-06-28 13:35:25 -0700
commita61d8f6110025d8fb606ce7edd832e661042f09b (patch)
tree7da8ad6260fe1a4dea4a5bb47dadb5b1e33152fa
parent28e80d7136b5b6ec758890a2d5b325d527d7dda9 (diff)
i965: Drop swtnl fallback code for i915.
Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.c12
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.h20
2 files changed, 0 insertions, 32 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 12fcb55acde..c7addfb19cd 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -357,21 +357,10 @@ intelInvalidateState(struct gl_context * ctx, GLuint new_state)
}
void
-intel_flush_rendering_to_batch(struct gl_context *ctx)
-{
- struct intel_context *intel = intel_context(ctx);
-
- if (intel->Fallback)
- _swrast_flush(ctx);
-}
-
-void
_intel_flush(struct gl_context *ctx, const char *file, int line)
{
struct intel_context *intel = intel_context(ctx);
- intel_flush_rendering_to_batch(ctx);
-
if (intel->batch.used)
_intel_batchbuffer_flush(intel, file, line);
}
@@ -707,7 +696,6 @@ intelDestroyContext(__DRIcontext * driContextPriv)
if (ctx->swrast_context)
_swrast_DestroyContext(&intel->ctx);
- intel->Fallback = 0x0; /* don't call _swrast_Flush later */
intel_batchbuffer_free(intel);
diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 84452b941c8..20c623d1568 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -72,25 +72,6 @@ typedef void (*intel_line_func) (struct intel_context *, intelVertex *,
intelVertex *);
typedef void (*intel_point_func) (struct intel_context *, intelVertex *);
-/**
- * Bits for intel->Fallback field
- */
-/*@{*/
-#define INTEL_FALLBACK_DRAW_BUFFER 0x1
-#define INTEL_FALLBACK_READ_BUFFER 0x2
-#define INTEL_FALLBACK_DEPTH_BUFFER 0x4
-#define INTEL_FALLBACK_STENCIL_BUFFER 0x8
-#define INTEL_FALLBACK_USER 0x10
-#define INTEL_FALLBACK_RENDERMODE 0x20
-#define INTEL_FALLBACK_TEXTURE 0x40
-#define INTEL_FALLBACK_DRIVER 0x1000 /**< first for drivers */
-/*@}*/
-
-extern void intelFallback(struct intel_context *intel, GLbitfield bit,
- bool mode);
-#define FALLBACK( intel, bit, mode ) intelFallback( intel, bit, mode )
-
-
#define INTEL_WRITE_PART 0x1
#define INTEL_WRITE_FULL 0x2
#define INTEL_READ 0x4
@@ -224,7 +205,6 @@ struct intel_context
} vtbl;
- GLbitfield Fallback; /**< mask of INTEL_FALLBACK_x bits */
GLuint NewGLState;
dri_bufmgr *bufmgr;