mesa: add helper _mesa_is_format_etc2

[mesa.git] / src / mesa / main / api_loopback.c

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 6b66319a9e425f5759af944168b41528a1039a6b..d10ae15ea2e23bcb30ee4384616a482027f95bd2 100644 (file)
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1,12 +1,11 @@
 /**
  * \file api_loopback.c
  *
- * \author Keith Whitwell <keith@tungstengraphics.com>
+ * \author Keith Whitwell <keithw@vmware.com>
  */
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -23,9 +22,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -34,9 +34,7 @@
 #include "api_loopback.h"
 #include "mtypes.h"
 #include "glapi/glapi.h"
-#include "glapi/glthread.h"
 #include "main/dispatch.h"
-#include "mfeatures.h"
 #include "main/context.h"
 
 /* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
@@ -1507,7 +1505,7 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_Color4ub(dest, _mesa_Color4ub);
       SET_Materialf(dest, _mesa_Materialf);
    }
-   if (ctx->API == API_OPENGL) {
+   if (ctx->API == API_OPENGL_COMPAT) {
       SET_Color3b(dest, _mesa_Color3b);
       SET_Color3d(dest, _mesa_Color3d);
       SET_Color3i(dest, _mesa_Color3i);
@@ -1654,7 +1652,7 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_FogCoorddv(dest, _mesa_FogCoorddv);
    }
 
-   if (ctx->API == API_OPENGL) {
+   if (ctx->API == API_OPENGL_COMPAT) {
       SET_VertexAttrib1sNV(dest, _mesa_VertexAttrib1sNV);
       SET_VertexAttrib1dNV(dest, _mesa_VertexAttrib1dNV);
       SET_VertexAttrib2sNV(dest, _mesa_VertexAttrib2sNV);