Fix pow <small> and a very stypid bug with dummy srcs(0 equals to tmp0.x)</small...

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

diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index e8912c70029210493957874beed56f95efaf7cdc..3b1f848e8c36c599518749a7dd60a6e44076b664 100644 (file)
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
@@ -795,52 +795,52 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
    switch (map) {
       case GL_PIXEL_MAP_I_TO_I:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT(ctx->Pixel.MapItoI[i]);
+            values[i] = (GLushort) CLAMP(ctx->Pixel.MapItoI[i], 0.0, 65535.0);
         }
         break;
       case GL_PIXEL_MAP_S_TO_S:
         for (i = 0; i < mapsize; i++) {
-           values[i] = (GLushort) ctx->Pixel.MapStoS[i];
+            values[i] = (GLushort) CLAMP(ctx->Pixel.MapStoS[i], 0.0, 65535.0);
         }
         break;
       case GL_PIXEL_MAP_I_TO_R:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoR[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapItoR[i] );
         }
         break;
       case GL_PIXEL_MAP_I_TO_G:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoG[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapItoG[i] );
         }
         break;
       case GL_PIXEL_MAP_I_TO_B:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoB[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapItoB[i] );
         }
         break;
       case GL_PIXEL_MAP_I_TO_A:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoA[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapItoA[i] );
         }
         break;
       case GL_PIXEL_MAP_R_TO_R:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapRtoR[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapRtoR[i] );
         }
         break;
       case GL_PIXEL_MAP_G_TO_G:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapGtoG[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapGtoG[i] );
         }
         break;
       case GL_PIXEL_MAP_B_TO_B:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapBtoB[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapBtoB[i] );
         }
         break;
       case GL_PIXEL_MAP_A_TO_A:
         for (i = 0; i < mapsize; i++) {
-           values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapAtoA[i] );
+           CLAMPED_FLOAT_TO_USHORT(values[i] , ctx->Pixel.MapAtoA[i] );
         }
         break;
       default:
@@ -1174,7 +1174,7 @@ _mesa_lookup_rgba_float(const struct gl_color_table *table,
    if (!table->Table || table->Size == 0)
       return;
 
-   switch (table->Format) {
+   switch (table->_BaseFormat) {
       case GL_INTENSITY:
          /* replace RGBA with I */
          if (table->Type == GL_FLOAT) {
@@ -1385,7 +1385,7 @@ _mesa_lookup_rgba_chan(const struct gl_color_table *table,
    if (!table->Table || table->Size == 0)
       return;
 
-   switch (table->Format) {
+   switch (table->_BaseFormat) {
       case GL_INTENSITY:
          /* replace RGBA with I */
          if (table->Type == GL_FLOAT) {
@@ -1838,6 +1838,19 @@ _mesa_map_stencil( const GLcontext *ctx, GLuint n, GLstencil stencil[] )
 }
 
 
+void
+_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
+                           GLfloat depthValues[])
+{
+   const GLfloat scale = ctx->Pixel.DepthScale;
+   const GLfloat bias = ctx->Pixel.DepthBias;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLfloat d = depthValues[i] * scale + bias;
+      depthValues[i] = CLAMP(d, 0.0F, 1.0F);
+   }
+}
+
 
 /*
  * This function converts an array of GLchan colors to GLfloat colors.
@@ -2025,9 +2038,6 @@ _mesa_init_pixel( GLcontext *ctx )
    ctx->Pixel.MapAtoA[0] = 0.0;
    ctx->Pixel.HistogramEnabled = GL_FALSE;
    ctx->Pixel.MinMaxEnabled = GL_FALSE;
-   ctx->Pixel.PixelTextureEnabled = GL_FALSE;
-   ctx->Pixel.FragmentRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
-   ctx->Pixel.FragmentAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
    ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0);
    ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0);
    ASSIGN_4V(ctx->Pixel.ColorTableScale, 1.0, 1.0, 1.0, 1.0);