remove final imports.h and imports.c bits

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_gldefs.h

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_gldefs.h b/src/mesa/drivers/dri/nouveau/nouveau_gldefs.h
index 46ec14ec55dd15e575de9a723e54db26834ec2da..11c3dbd3de15fae67dad33b670670c5bfec3cdab 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_gldefs.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_gldefs.h
@@ -85,47 +85,6 @@ nvgl_blend_eqn(unsigned eqn)
        }
 }
 
-static inline unsigned
-nvgl_logicop_func(unsigned func)
-{
-       switch (func) {
-       case GL_CLEAR:
-               return 0x1500;
-       case GL_NOR:
-               return 0x1508;
-       case GL_AND_INVERTED:
-               return 0x1504;
-       case GL_COPY_INVERTED:
-               return 0x150c;
-       case GL_AND_REVERSE:
-               return 0x1502;
-       case GL_INVERT:
-               return 0x150a;
-       case GL_XOR:
-               return 0x1506;
-       case GL_NAND:
-               return 0x150e;
-       case GL_AND:
-               return 0x1501;
-       case GL_EQUIV:
-               return 0x1509;
-       case GL_NOOP:
-               return 0x1505;
-       case GL_OR_INVERTED:
-               return 0x150d;
-       case GL_COPY:
-               return 0x1503;
-       case GL_OR_REVERSE:
-               return 0x150b;
-       case GL_OR:
-               return 0x1507;
-       case GL_SET:
-               return 0x150f;
-       default:
-               assert(0);
-       }
-}
-
 static inline unsigned
 nvgl_comparison_op(unsigned op)
 {
@@ -238,6 +197,25 @@ nvgl_wrap_mode(unsigned wrap)
        }
 }
 
+static inline unsigned
+nvgl_wrap_mode_nv20(unsigned wrap)
+{
+       switch (wrap) {
+       case GL_REPEAT:
+               return 0x1;
+       case GL_MIRRORED_REPEAT:
+               return 0x2;
+       case GL_CLAMP:
+               return 0x5;
+       case GL_CLAMP_TO_EDGE:
+               return 0x3;
+       case GL_CLAMP_TO_BORDER:
+               return 0x4;
+       default:
+               unreachable("Bad GL texture wrap mode");
+       }
+}
+
 static inline unsigned
 nvgl_filter_mode(unsigned filter)
 {