svn merge ^/branches/released .

1 files changed, 2 insertions, 44 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index c9dfe248f..17596d4c8 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -36,6 +36,7 @@
 

 #include "st_context.h"

 #include "st_cb_texture.h"

+#include "st_format.h"

 #include "st_atom.h"

 #include "pipe/p_context.h"

 #include "pipe/p_defines.h"

@@ -117,49 +118,6 @@ gl_filter_to_img_filter(GLenum filter)
 }

 

 

-static void

-xlate_border_color(const GLfloat *colorIn, GLenum baseFormat, GLfloat *colorOut)

-{

-   switch (baseFormat) {

-   case GL_RED:

-      colorOut[0] = colorIn[0];

-      colorOut[1] = 0.0F;

-      colorOut[2] = 0.0F;

-      colorOut[3] = 1.0F;

-      break;

-   case GL_RG:

-      colorOut[0] = colorIn[0];

-      colorOut[1] = colorIn[1];

-      colorOut[2] = 0.0F;

-      colorOut[3] = 1.0F;

-      break;

-   case GL_RGB:

-      colorOut[0] = colorIn[0];

-      colorOut[1] = colorIn[1];

-      colorOut[2] = colorIn[2];

-      colorOut[3] = 1.0F;

-      break;

-   case GL_ALPHA:

-      colorOut[0] = colorOut[1] = colorOut[2] = 0.0;

-      colorOut[3] = colorIn[3];

-      break;

-   case GL_LUMINANCE:

-      colorOut[0] = colorOut[1] = colorOut[2] = colorIn[0];

-      colorOut[3] = 1.0;

-      break;

-   case GL_LUMINANCE_ALPHA:

-      colorOut[0] = colorOut[1] = colorOut[2] = colorIn[0];

-      colorOut[3] = colorIn[3];

-      break;

-   case GL_INTENSITY:

-      colorOut[0] = colorOut[1] = colorOut[2] = colorOut[3] = colorIn[0];

-      break;

-   default:

-      COPY_4V(colorOut, colorIn);

-   }

-}

-

-

 static void 

 update_samplers(struct st_context *st)

 {

@@ -223,7 +181,7 @@ update_samplers(struct st_context *st)
             assert(sampler->min_lod <= sampler->max_lod);

          }

 

-         xlate_border_color(texobj->BorderColor.f,

+         st_translate_color(texobj->BorderColor.f,

                             teximg ? teximg->_BaseFormat : GL_RGBA,

                             sampler->border_color);