Module: wine Branch: master Commit: cd8f5c86ef04d353d519f14bdef615f423b2ed52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8f5c86ef04d353d519f14bde...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jun 11 11:53:40 2009 +0200
opengl32: Make the script default to version 1.1. Remove the glGetLevelParameter stubs.
---
dlls/opengl32/make_opengl | 8 +++----- dlls/opengl32/opengl32.spec | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 752ac87..b2966dc 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -22,7 +22,7 @@ use strict; # http://oss.sgi.com/cgi-bin/cvsweb.cgi/projects/ogl-sample/main/doc/registry/... # # - opengl_version is the OpenGL version emulated by the library -# (can be 1.0 to 1.5). The default is 1.2. +# (can be 1.0 to 1.5). The default is 1.1. # # This script generates the three following files : # @@ -314,7 +314,7 @@ if (@ARGV > 1) { $name0=~s%^.*/%%; die "Usage: $name0 [version]\n"; } -my $version = $ARGV[0] || "1.2"; +my $version = $ARGV[0] || "1.1"; if ($version eq "1.0") { %norm_categories = %cat_1_0; } elsif ($version eq "1.1") { @@ -644,9 +644,7 @@ foreach (sort keys %norm_functions) { print SPEC ") wine_$func_name\n"; }
-print SPEC "@ stub glGetLevelParameterfv -@ stub glGetLevelParameteriv -@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat +print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext @ stdcall wglCreateLayerContext(long long) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 09ddf47..a965771 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -334,8 +334,6 @@ @ stdcall glVertex4sv( ptr ) wine_glVertex4sv @ stdcall glVertexPointer( long long long ptr ) wine_glVertexPointer @ stdcall glViewport( long long long long ) wine_glViewport -@ stub glGetLevelParameterfv -@ stub glGetLevelParameteriv @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext