i965/program_cache: Cast the key to char * before adding key_size

[mesa.git] / src / mesa / drivers / dri / i965 / intel_state.c

diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/intel_state.c
index 99e75cb1a4d87f3579054bffddf59549e5cfd932..3d477dfcf0fa102a1a811fe5d15c331fa8fcff7a 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_state.c
+++ b/src/mesa/drivers/dri/i965/intel_state.c
@@ -1,5 +1,4 @@
-/**************************************************************************
- *
+/*
  * Copyright 2003 VMware, Inc.
  * All Rights Reserved.
  *
@@ -7,7 +6,7 @@
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
+ * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
  *
@@ -17,20 +16,16 @@
  *
  * 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 NON-INFRINGEMENT.
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
  * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
+ */
 
-#include "main/glheader.h"
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "main/colormac.h"
 #include "main/dd.h"
 
 #include "intel_screen.h"
@@ -70,8 +65,7 @@ intel_translate_shadow_compare_func(GLenum func)
       return BRW_COMPAREFUNCTION_NEVER;
    }
 
-   assert(!"Invalid shadow comparison function.");
-   return BRW_COMPAREFUNCTION_NEVER;
+   unreachable("Invalid shadow comparison function.");
 }
 
 int
@@ -96,8 +90,7 @@ intel_translate_compare_func(GLenum func)
       return BRW_COMPAREFUNCTION_ALWAYS;
    }
 
-   assert(!"Invalid comparison function.");
-   return BRW_COMPAREFUNCTION_ALWAYS;
+   unreachable("Invalid comparison function.");
 }
 
 int
@@ -124,44 +117,3 @@ intel_translate_stencil_op(GLenum op)
       return BRW_STENCILOP_ZERO;
    }
 }
-
-int
-intel_translate_logic_op(GLenum opcode)
-{
-   switch (opcode) {
-   case GL_CLEAR:
-      return BRW_LOGICOPFUNCTION_CLEAR;
-   case GL_AND:
-      return BRW_LOGICOPFUNCTION_AND;
-   case GL_AND_REVERSE:
-      return BRW_LOGICOPFUNCTION_AND_REVERSE;
-   case GL_COPY:
-      return BRW_LOGICOPFUNCTION_COPY;
-   case GL_COPY_INVERTED:
-      return BRW_LOGICOPFUNCTION_COPY_INVERTED;
-   case GL_AND_INVERTED:
-      return BRW_LOGICOPFUNCTION_AND_INVERTED;
-   case GL_NOOP:
-      return BRW_LOGICOPFUNCTION_NOOP;
-   case GL_XOR:
-      return BRW_LOGICOPFUNCTION_XOR;
-   case GL_OR:
-      return BRW_LOGICOPFUNCTION_OR;
-   case GL_OR_INVERTED:
-      return BRW_LOGICOPFUNCTION_OR_INVERTED;
-   case GL_NOR:
-      return BRW_LOGICOPFUNCTION_NOR;
-   case GL_EQUIV:
-      return BRW_LOGICOPFUNCTION_EQUIV;
-   case GL_INVERT:
-      return BRW_LOGICOPFUNCTION_INVERT;
-   case GL_OR_REVERSE:
-      return BRW_LOGICOPFUNCTION_OR_REVERSE;
-   case GL_NAND:
-      return BRW_LOGICOPFUNCTION_NAND;
-   case GL_SET:
-      return BRW_LOGICOPFUNCTION_SET;
-   default:
-      return BRW_LOGICOPFUNCTION_SET;
-   }
-}