mesa: Implement ARB_shader_viewport_layer_array for i965

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

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_util.h b/src/mesa/drivers/dri/nouveau/nouveau_util.h
index 6905c42c627dbc92f29b1dd98cdce29a4883d336..8087445b65a577ec7f706c6ea8a9b1307a031781 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_util.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_util.h
@@ -31,22 +31,22 @@
 #include "main/colormac.h"
 
 static inline unsigned
-pack_rgba_i(mesa_format f, uint8_t c[])
+pack_rgba_i(mesa_format f, const uint8_t c[])
 {
        switch (f) {
-       case MESA_FORMAT_ARGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
                return PACK_COLOR_8888(c[ACOMP], c[RCOMP], c[GCOMP], c[BCOMP]);
-       case MESA_FORMAT_ARGB8888_REV:
+       case MESA_FORMAT_A8R8G8B8_UNORM:
                return PACK_COLOR_8888(c[BCOMP], c[GCOMP], c[RCOMP], c[ACOMP]);
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return PACK_COLOR_8888(0, c[RCOMP], c[GCOMP], c[BCOMP]);
-       case MESA_FORMAT_XRGB8888_REV:
+       case MESA_FORMAT_X8R8G8B8_UNORM:
                return PACK_COLOR_8888(c[BCOMP], c[GCOMP], c[RCOMP], 0);
-       case MESA_FORMAT_RGBA8888:
+       case MESA_FORMAT_A8B8G8R8_UNORM:
                return PACK_COLOR_8888(c[RCOMP], c[GCOMP], c[BCOMP], c[ACOMP]);
-       case MESA_FORMAT_RGBA8888_REV:
+       case MESA_FORMAT_R8G8B8A8_UNORM:
                return PACK_COLOR_8888(c[ACOMP], c[BCOMP], c[GCOMP], c[RCOMP]);
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return PACK_COLOR_565(c[RCOMP], c[GCOMP], c[BCOMP]);
        default:
                assert(0);
@@ -57,11 +57,11 @@ static inline unsigned
 pack_zs_i(mesa_format f, uint32_t z, uint8_t s)
 {
        switch (f) {
-       case MESA_FORMAT_Z24_S8:
+       case MESA_FORMAT_S8_UINT_Z24_UNORM:
                return (z & 0xffffff00) | (s & 0xff);
-       case MESA_FORMAT_Z24_X8:
+       case MESA_FORMAT_X8_UINT_Z24_UNORM:
                return (z & 0xffffff00);
-       case MESA_FORMAT_Z16:
+       case MESA_FORMAT_Z_UNORM16:
                return (z & 0xffff0000) >> 16;
        default:
                assert(0);
@@ -69,7 +69,7 @@ pack_zs_i(mesa_format f, uint32_t z, uint8_t s)
 }
 
 static inline unsigned
-pack_rgba_f(mesa_format f, float c[])
+pack_rgba_f(mesa_format f, const float c[])
 {
        return pack_rgba_i(f, (uint8_t []) {
                           FLOAT_TO_UBYTE(c[RCOMP]),
@@ -79,7 +79,7 @@ pack_rgba_f(mesa_format f, float c[])
 }
 
 static inline unsigned
-pack_rgba_clamp_f(mesa_format f, float c[])
+pack_rgba_clamp_f(mesa_format f, const float c[])
 {
        GLubyte bytes[4];
        _mesa_unclamped_float_rgba_to_ubyte(bytes, c);
@@ -92,6 +92,15 @@ pack_zs_f(mesa_format f, float z, uint8_t s)
        return pack_zs_i(f, FLOAT_TO_UINT(z), s);
 }
 
+static inline unsigned
+pack_la_clamp_f(mesa_format f, float l, float a)
+{
+       GLubyte lb, ab;
+       UNCLAMPED_FLOAT_TO_UBYTE(lb, l);
+       UNCLAMPED_FLOAT_TO_UBYTE(ab, a);
+       return pack_rgba_i(f, (uint8_t []) { lb, lb, lb, ab });
+}
+
 /* Integer base-2 logarithm, rounded towards zero. */
 static inline unsigned
 log2i(unsigned i)
@@ -120,12 +129,6 @@ log2i(unsigned i)
        return r;
 }
 
-static inline unsigned
-align(unsigned x, unsigned m)
-{
-       return (x + m - 1) & ~(m - 1);
-}
-
 static inline void
 get_scissors(struct gl_framebuffer *fb, int *x, int *y, int *w, int *h)
 {