projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: add shader_storage_block_binding() helper
[mesa.git]
/
src
/
mesa
/
main
/
convolve.c
diff --git
a/src/mesa/main/convolve.c
b/src/mesa/main/convolve.c
index 5f1e85b6bacaf6a86219350779333c6837456859..83d590f4a48b43e91e23cd7a03a6e124ba3a3095 100644
(file)
--- a/
src/mesa/main/convolve.c
+++ b/
src/mesa/main/convolve.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 6.5.2
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
@@
-33,11
+32,8
@@
#include "glheader.h"
#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
+#include "context.h"
#include "convolve.h"
#include "convolve.h"
-#include "macros.h"
-#include "mtypes.h"
#include "main/dispatch.h"
#include "main/dispatch.h"
@@
-46,7
+42,7
@@
_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glConvolutionFilter1D");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glConvolutionFilter1D");
}
void GLAPIENTRY
}
void GLAPIENTRY
@@
-54,7
+50,7
@@
_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glConvolutionFilter2D");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glConvolutionFilter2D");
}
}
@@
-63,7
+59,7
@@
_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glConvolutionParameterf");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glConvolutionParameterf");
}
}
@@
-72,7
+68,7
@@
_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glConvolutionParameterfv");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glConvolutionParameterfv");
}
}
@@
-81,7
+77,7
@@
_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glConvolutionParameteri");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glConvolutionParameteri");
}
}
@@
-90,7
+86,7
@@
_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glConvolutionParameteriv");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glConvolutionParameteriv");
}
}
@@
-99,7
+95,7
@@
_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glCopyConvolutionFilter1D");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glCopyConvolutionFilter1D");
}
}
@@
-108,7
+104,7
@@
_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glCopyConvolutionFilter2D");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glCopyConvolutionFilter2D");
}
}
@@
-135,7
+131,7
@@
_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glGetConvolutionParameterfv");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glGetConvolutionParameterfv");
}
}
@@
-144,7
+140,7
@@
_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glGetConvolutionParameteriv");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glGetConvolutionParameteriv");
}
}
@@
-156,7
+152,7
@@
_mesa_GetnSeparableFilterARB(GLenum target, GLenum format, GLenum type,
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glGetSeparableFilter");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glGetSeparableFilter");
}
}
@@
-174,5
+170,5
@@
_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glSeparableFilter2D");
+ _mesa_error(ctx, GL_INVALID_
OPERATION
, "glSeparableFilter2D");
}
}