glthread: track primitive restart state

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

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 5f1e85b6bacaf6a86219350779333c6837456859..e2c355c4f415d19721d3dd80ad5346cd7576af88 100644 (file)
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.2
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
@@ -33,12 +32,8 @@
 
 
 #include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
+#include "context.h"
 #include "convolve.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
 
 
 void GLAPIENTRY
@@ -46,7 +41,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter1D");
 }
 
 void GLAPIENTRY
@@ -54,7 +49,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter2D");
 }
 
 
@@ -63,7 +58,7 @@ _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionParameterf");
 }
 
 
@@ -72,7 +67,7 @@ _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionParameterfv");
 }
 
 
@@ -81,7 +76,7 @@ _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionParameteri");
 }
 
 
@@ -90,7 +85,7 @@ _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionParameteriv");
 }
 
 
@@ -99,7 +94,7 @@ _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyConvolutionFilter1D");
 }
 
 
@@ -108,7 +103,7 @@ _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyConvolutionFilter2D");
 }
 
 
@@ -135,7 +130,7 @@ _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionParameterfv");
 }
 
 
@@ -144,7 +139,7 @@ _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionParameteriv");
 }
 
 
@@ -156,7 +151,7 @@ _mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type,
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSeparableFilter");
 }
 
 
@@ -174,5 +169,5 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D");
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glSeparableFilter2D");
 }