#include "packsingle.h"
#include "indirect.h"
-#include "glapitable.h"
-#include "glapidispatch.h"
#include "glapi.h"
-#include "glthread.h"
-#include "glapioffsets.h"
#include <GL/glxproto.h>
void
heightsize = __glImageSize(height, 1, 1, format, type, 0);
/* Allocate a holding buffer to transform the data from */
- rowBuf = (GLubyte *) Xmalloc(widthsize);
+ rowBuf = malloc(widthsize);
if (!rowBuf) {
/* Throw data away */
_XEatData(dpy, compsize);
else {
__GLX_SINGLE_GET_CHAR_ARRAY(((char *) rowBuf), widthsize);
__glEmptyImage(gc, 1, width, 1, 1, format, type, rowBuf, row);
- Xfree((char *) rowBuf);
+ free((char *) rowBuf);
}
- colBuf = (GLubyte *) Xmalloc(heightsize);
+ colBuf = malloc(heightsize);
if (!colBuf) {
/* Throw data away */
_XEatData(dpy, compsize - __GLX_PAD(widthsize));
else {
__GLX_SINGLE_GET_CHAR_ARRAY(((char *) colBuf), heightsize);
__glEmptyImage(gc, 1, height, 1, 1, format, type, colBuf, column);
- Xfree((char *) colBuf);
+ free((char *) colBuf);
}
}
else {
}
-#define CONCAT(a,b) a ## b
-#define NAME(o) CONCAT(gl_dispatch_stub_, o)
-
-void NAME(_gloffset_GetSeparableFilter) (GLenum target, GLenum format,
- GLenum type, GLvoid * row,
- GLvoid * column, GLvoid * span)
+/* it is defined to gl_dispatch_stub_NNN in indirect.h */
+void gl_dispatch_stub_GetSeparableFilterEXT (GLenum target, GLenum format,
+ GLenum type, GLvoid * row,
+ GLvoid * column, GLvoid * span)
{
struct glx_context *const gc = __glXGetCurrentContext();
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
- if (gc->driContext) {
- CALL_GetSeparableFilter(GET_DISPATCH(),
- (target, format, type, row, column, span));
+ if (gc->isDirect) {
+ const _glapi_proc *const table = (_glapi_proc *) GET_DISPATCH();
+ PFNGLGETSEPARABLEFILTEREXTPROC p =
+ (PFNGLGETSEPARABLEFILTEREXTPROC) table[359];
+
+ p(target, format, type, row, column, span);
return;
}
else
const GLint heightsize =
__glImageSize(height, 1, 1, format, type, 0);
GLubyte *const buf =
- (GLubyte *) Xmalloc((widthsize > heightsize) ? widthsize :
- heightsize);
+ malloc((widthsize > heightsize) ? widthsize : heightsize);
if (buf == NULL) {
/* Throw data away */
__glEmptyImage(gc, 1, height, 1, 1, format, type, buf, column);
- Xfree((char *) buf);
+ free((char *) buf);
}
}
}