summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-02 12:53:46 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-11-05 08:04:47 -0700
commite8f1006081f9cf638d9f3869da24f6c96d227eba (patch)
treef910da4a601d37b89aba2a9aebdfc933ee9e2578
parent798658cc81ca0d0ecb6d5c0aa9539e4d0996ec6d (diff)
remove dead code, unnecessary #includes, etc
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c14
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_lock.c11
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_screen.c2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c3
4 files changed, 2 insertions, 28 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 3898d2e4af..188e973de0 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -44,8 +44,6 @@
#include "pipe/p_defines.h"
#include "pipe/p_context.h"
-/*#include "drirenderbuffer.h"*/
-#include "vblank.h"
#include "utils.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */
@@ -327,6 +325,7 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
}
}
+
GLboolean
intelUnbindContext(__DRIcontextPrivate * driContextPriv)
{
@@ -358,14 +357,6 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
__DRIdrawablePrivate * driDrawPriv,
__DRIdrawablePrivate * driReadPriv)
{
-
-#if 0
- if (driDrawPriv) {
- fprintf(stderr, "x %d, y %d, width %d, height %d\n",
- driDrawPriv->x, driDrawPriv->y, driDrawPriv->w, driDrawPriv->h);
- }
-#endif
-
if (driContextPriv) {
struct intel_context *intel =
(struct intel_context *) driContextPriv->driverPrivate;
@@ -393,7 +384,6 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
intelWindowMoved(intel);
intel->lastStamp = driDrawPriv->lastStamp;
}
-
}
else {
_mesa_make_current(NULL, NULL, NULL);
@@ -413,8 +403,6 @@ struct intel_context *intelScreenContext(intelScreenPrivate *intelScreen)
GET_CURRENT_CONTEXT(ctx);
if (ctx == NULL) {
-/* _mesa_problem(NULL, "No current context in intelScreenContext\n");
- return NULL; */
/* need a context for the first time makecurrent is called (for hw lock
when allocating priv buffers) */
if (intelScreen->dummyctxptr == NULL) {
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index 01d02f9a2a..9636fa998d 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -28,7 +28,7 @@
#include "glheader.h"
#include "context.h"
-#include "extensions.h"
+#include "state_tracker/st_public.h"
#include "intel_screen.h"
#include "intel_context.h"
@@ -38,15 +38,6 @@
#include "i830_dri.h"
-#include "state_tracker/st_public.h"
-#include "state_tracker/st_context.h"
-
-#include "drirenderbuffer.h"
-#include "vblank.h"
-#include "utils.h"
-#include "xmlpool.h" /* for symbolic values of enum-type options */
-
-
_glthread_DECLARE_STATIC_MUTEX( lockMutex );
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index 16e3a226e2..1fa6b57378 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -28,9 +28,7 @@
#include "glheader.h"
#include "context.h"
#include "framebuffer.h"
-#include "matrix.h"
#include "renderbuffer.h"
-#include "simple_list.h"
#include "utils.h"
#include "vblank.h"
#include "xmlpool.h"
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index a642d53216..f6e7e16000 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -32,9 +32,6 @@
#include "intel_reg.h"
#include "intel_winsys.h"
#include "context.h"
-#include "utils.h"
-#include "drirenderbuffer.h"
-#include "vblank.h"
#include "pipe/p_context.h"
#include "state_tracker/st_context.h"