ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

opengl32: Call standard OpenGL functions through the TEB function table.

This commit is contained in:
Alexandre Julliard 2012-07-16 23:39:31 +02:00
parent 33ca17e1e9
commit 5bfd5f3d7b
3 changed files with 675 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/opengl32/make_opengl
View File

@ -225,9 +225,9 @@ sub ConvertVarName($)
# #
# This functions generates the thunk for a given function. # This functions generates the thunk for a given function.
# #
sub GenerateThunk($$$$$) sub GenerateThunk($$$$)
{ {
my ($func_ref, $comment, $prefix, $thread_safe, $local_var) = @_; my ($func_ref, $comment, $prefix, $local_var) = @_;
my $ret = ""; my $ret = "";
my $call_arg = ""; my $call_arg = "";
my $trace_call_arg = ""; my $trace_call_arg = "";
@ -282,8 +282,9 @@ sub GenerateThunk($$$$$)
} }
} }
$ret .= 'void ' if (!@{$func_ref->[2]}); $ret .= 'void ' if (!@{$func_ref->[2]});
$ret = "$ret) {\n"; $ret .= ") {\n";
if ($func_ref->[1] ne "void" && $thread_safe) { $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n" unless $local_var;
if ($func_ref->[1] ne "void" && $gen_thread_safe) {
$ret = "$ret " . ConvertType($func_ref->[1]) . " ret_value;\n"; $ret = "$ret " . ConvertType($func_ref->[1]) . " ret_value;\n";
} }
$ret .= $local_var; $ret .= $local_var;
@ -294,7 +295,7 @@ sub GenerateThunk($$$$$)
} }
$ret = "$ret);\n"; $ret = "$ret);\n";
} }
if ($thread_safe) { if ($gen_thread_safe) {
$ret .= " ENTER_GL();\n"; $ret .= " ENTER_GL();\n";
$ret .= " "; $ret .= " ";
if ($func_ref->[1] ne "void") { if ($func_ref->[1] ne "void") {
@ -806,9 +807,9 @@ print NORM "
WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DEFAULT_DEBUG_CHANNEL(opengl);
"; ";
foreach (sort keys %norm_functions) {
my $string = GenerateThunk($norm_functions{$_}, 1, "", $gen_thread_safe, "");
foreach (sort keys %norm_functions) {
my $string = GenerateThunk($norm_functions{$_}, 1, "funcs->gl.p_", "");
print NORM "\n$string" if $string; print NORM "\n$string" if $string;
} }
@ -864,7 +865,7 @@ foreach (sort keys %ext_functions) {
} }
$local_var .= 'void ' if (!@{$func_ref->[2]}); $local_var .= 'void ' if (!@{$func_ref->[2]});
$local_var .= ") = extension_funcs[EXT_$func_ref->[0]];\n"; $local_var .= ") = extension_funcs[EXT_$func_ref->[0]];\n";
print EXT "\nstatic ", GenerateThunk($ext_functions{$_}, 0, $ext_prefix, $gen_thread_safe, $local_var); print EXT "\nstatic ", GenerateThunk($ext_functions{$_}, 0, $ext_prefix, $local_var);
} }
# Then the table giving the string <-> function correspondence */ # Then the table giving the string <-> function correspondence */

996
dlls/opengl32/opengl_norm.c
View File

File diff suppressed because it is too large Load Diff

4
dlls/opengl32/tests/opengl.c
View File

@ -1205,7 +1205,7 @@ static void test_destroy(HDC oldhdc)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glFinish(); glFinish();
glerr = glGetError(); glerr = glGetError();
todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = SwapBuffers(dc); ret = SwapBuffers(dc);
err = GetLastError(); err = GetLastError();
@ -1363,7 +1363,7 @@ static void test_destroy_read(HDC oldhdc)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glFinish(); glFinish();
glerr = glGetError(); glerr = glGetError();
todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = SwapBuffers(draw_dc); ret = SwapBuffers(draw_dc);
err = GetLastError(); err = GetLastError();