i965: Don't allocate a 1-level texture when GL_GENERATE_MIPMAP is set.

[mesa.git] / src / mesa / drivers / dri / common / dri_test.c

diff --git a/src/mesa/drivers/dri/common/dri_test.c b/src/mesa/drivers/dri/common/dri_test.c
index f55ec6d52beec078e93c0f5fc7ae384955c0f6b7..35732857dda816d97e064b1c2af68cf6f6c1d4f3 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_test.c
+++ b/src/mesa/drivers/dri/common/dri_test.c
@@ -17,11 +17,16 @@ PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch
 PUBLIC __thread void * _glapi_tls_Context
     __attribute__((tls_model("initial-exec")));
 
-#endif
-
 PUBLIC const struct _glapi_table *_glapi_Dispatch;
 PUBLIC const void *_glapi_Context;
 
+#else
+
+PUBLIC struct _glapi_table *_glapi_Dispatch;
+PUBLIC void *_glapi_Context;
+
+#endif
+
 PUBLIC void
 _glapi_check_multithread(void)
 {}
@@ -71,8 +76,16 @@ _glapi_get_dispatch_table_size(void)
        return 0;
 }
 
+PUBLIC unsigned long
+_glthread_GetID(void)
+{
+   return 0;
+}
+
+#ifndef NO_MAIN
 int main(int argc, char** argv)
 {
    void* p = __driDriverExtensions;
    return (int)(unsigned long)p;
 }
+#endif