Skip to content

W
wine-winehq
Commit 99e24f00 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

glu32: Import mipmap functions from Mesa.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent b7279bad
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 37 deletions
dlls/glu32/Makefile.in
View file @ 99e24f00
...@@ -4,5 +4,6 @@ IMPORTS = opengl32 ...@@ -4,5 +4,6 @@ IMPORTS = opengl32
C_SRCS = \ C_SRCS = \
glu.c \ glu.c \
mipmap.c \
project.c \ project.c \
quad.c quad.c
dlls/glu32/glu.c
View file @ 99e24f00
...@@ -123,8 +123,6 @@ typedef struct { ...@@ -123,8 +123,6 @@ typedef struct {
static void (*p_gluBeginCurve)( GLUnurbs* nurb ); static void (*p_gluBeginCurve)( GLUnurbs* nurb );
static void (*p_gluBeginSurface)( GLUnurbs* nurb ); static void (*p_gluBeginSurface)( GLUnurbs* nurb );
static void (*p_gluBeginTrim)( GLUnurbs* nurb ); static void (*p_gluBeginTrim)( GLUnurbs* nurb );
static GLint (*p_gluBuild1DMipmaps)( GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data );
static GLint (*p_gluBuild2DMipmaps)( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data );
static void (*p_gluDeleteNurbsRenderer)( GLUnurbs* nurb ); static void (*p_gluDeleteNurbsRenderer)( GLUnurbs* nurb );
static void (*p_gluDeleteTess)( GLUtesselator* tess ); static void (*p_gluDeleteTess)( GLUtesselator* tess );
static void (*p_gluEndCurve)( GLUnurbs* nurb ); static void (*p_gluEndCurve)( GLUnurbs* nurb );
...@@ -140,7 +138,6 @@ static void (*p_gluNurbsCurve)( GLUnurbs* nurb, GLint knotCount, GLfloat *knots ...@@ -140,7 +138,6 @@ static void (*p_gluNurbsCurve)( GLUnurbs* nurb, GLint knotCount, GLfloat *knots
static void (*p_gluNurbsProperty)( GLUnurbs* nurb, GLenum property, GLfloat value ); static void (*p_gluNurbsProperty)( GLUnurbs* nurb, GLenum property, GLfloat value );
static void (*p_gluNurbsSurface)( GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type ); static void (*p_gluNurbsSurface)( GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type );
static void (*p_gluPwlCurve)( GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type ); static void (*p_gluPwlCurve)( GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type );
static GLint (*p_gluScaleImage)( GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut );
static void (*p_gluTessBeginContour)( GLUtesselator* tess ); static void (*p_gluTessBeginContour)( GLUtesselator* tess );
static void (*p_gluTessBeginPolygon)( GLUtesselator* tess, GLvoid* data ); static void (*p_gluTessBeginPolygon)( GLUtesselator* tess, GLvoid* data );
static void (*p_gluTessCallback)( GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc ); static void (*p_gluTessCallback)( GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc );
...@@ -212,37 +209,6 @@ const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode ) ...@@ -212,37 +209,6 @@ const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode )
} }
/*********************************************************************** /***********************************************************************
* gluScaleImage (GLU32.@)
*/
int WINAPI wine_gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum typein, const void *datain,
GLint widthout, GLint heightout, GLenum typeout, void *dataout )
{
if (!LOAD_FUNCPTR( gluScaleImage )) return GLU_OUT_OF_MEMORY;
return p_gluScaleImage( format, widthin, heightin, typein, datain,
widthout, heightout, typeout, dataout );
}
/***********************************************************************
* gluBuild1DMipmaps (GLU32.@)
*/
int WINAPI wine_gluBuild1DMipmaps( GLenum target, GLint components, GLint width,
GLenum format, GLenum type, const void *data )
{
if (!LOAD_FUNCPTR( gluBuild1DMipmaps )) return GLU_OUT_OF_MEMORY;
return p_gluBuild1DMipmaps( target, components, width, format, type, data );
}
/***********************************************************************
* gluBuild2DMipmaps (GLU32.@)
*/
int WINAPI wine_gluBuild2DMipmaps( GLenum target, GLint components, GLint width, GLint height,
GLenum format, GLenum type, const void *data )
{
if (!LOAD_FUNCPTR( gluBuild2DMipmaps )) return GLU_OUT_OF_MEMORY;
return p_gluBuild2DMipmaps( target, components, width, height, format, type, data );
}
/***********************************************************************
* gluNewNurbsRenderer (GLU32.@) * gluNewNurbsRenderer (GLU32.@)
*/ */
GLUnurbs * WINAPI wine_gluNewNurbsRenderer(void) GLUnurbs * WINAPI wine_gluNewNurbsRenderer(void)
......
dlls/glu32/glu32.spec
View file @ 99e24f00
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
@ stdcall gluBeginPolygon(ptr) wine_gluBeginPolygon @ stdcall gluBeginPolygon(ptr) wine_gluBeginPolygon
@ stdcall gluBeginSurface(ptr) wine_gluBeginSurface @ stdcall gluBeginSurface(ptr) wine_gluBeginSurface
@ stdcall gluBeginTrim(ptr) wine_gluBeginTrim @ stdcall gluBeginTrim(ptr) wine_gluBeginTrim
@ stdcall gluBuild1DMipmaps(long long long long long ptr) wine_gluBuild1DMipmaps @ stdcall gluBuild1DMipmaps(long long long long long ptr)
@ stdcall gluBuild2DMipmaps(long long long long long long ptr) wine_gluBuild2DMipmaps @ stdcall gluBuild2DMipmaps(long long long long long long ptr)
@ stdcall gluCheckExtension(str ptr) wine_gluCheckExtension @ stdcall gluCheckExtension(str ptr) wine_gluCheckExtension
@ stdcall gluCylinder(ptr double double double long long) @ stdcall gluCylinder(ptr double double double long long)
@ stdcall gluDeleteNurbsRenderer(ptr) wine_gluDeleteNurbsRenderer @ stdcall gluDeleteNurbsRenderer(ptr) wine_gluDeleteNurbsRenderer
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
@ stdcall gluQuadricNormals(ptr long) @ stdcall gluQuadricNormals(ptr long)
@ stdcall gluQuadricOrientation(ptr long) @ stdcall gluQuadricOrientation(ptr long)
@ stdcall gluQuadricTexture(ptr long) @ stdcall gluQuadricTexture(ptr long)
@ stdcall gluScaleImage(long long long long ptr long long long ptr) wine_gluScaleImage @ stdcall gluScaleImage(long long long long ptr long long long ptr)
@ stdcall gluSphere(ptr double long long) @ stdcall gluSphere(ptr double long long)
@ stdcall gluTessBeginContour(ptr) wine_gluTessBeginContour @ stdcall gluTessBeginContour(ptr) wine_gluTessBeginContour
@ stdcall gluTessBeginPolygon(ptr ptr) wine_gluTessBeginPolygon @ stdcall gluTessBeginPolygon(ptr ptr) wine_gluTessBeginPolygon
......
dlls/glu32/mipmap.c 0 → 100644
View file @ 99e24f00
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment