jepler/regal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Emulation support for DSA gl(Enable|Disable)VertexArrayEXT and VertexArrayOffset commands.

Browse source 
Initial implementation of Draw*Elements*BaseVertex* emulation.
IBM_texture_mirrored_repeat extension emulation for ES 2.0.
Use REGAL_CALL for GLDEBUGPROC* function typedefs.
Fix logging of string in glNamedProgramStringARB.
Fix logging of commands with ref and mask.
This commit is contained in:
Nigel Stewart 2013-06-15 08:52:59 -05:00
parent f649ec6e0e
commit be8dc8b892
46 changed files with 1451 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/win32/vs2010/Regal/Regal.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalglew.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalglewlib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalglu.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalglulib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalglut.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;rglu32.lib;gdi32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;rglu32.lib;gdi32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;rglu32.lib;gdi32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;rglu32.lib;gdi32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalglutlib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regallib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalm.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;pnglib.lib;zlib.lib;jsonsllib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;pnglib.lib;zlib.lib;jsonsllib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;pnglib.lib;zlib.lib;jsonsllib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>mongooselib.lib;md5lib.lib;pnglib.lib;zlib.lib;jsonsllib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regalmlib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/Regaltest.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>gtestlib.lib;regallib.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;snappylib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>gtestlib.lib;regallib.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;snappylib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>gtestlib.lib;regallib.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;snappylib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>gtestlib.lib;regallib.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;squishlib.lib;snappylib.lib;pnglib.lib;zlib.lib;advapi32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/dreamtorus.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/dreamtorus_static.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;mongooselib.lib;md5lib.lib;jsonsllib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/dreamtorus_win32.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>regal32.lib;gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/freetypelib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/gtestlib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/jsonsllib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/md5lib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/mongooselib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/png.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/pnglib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/snappylib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/squishlib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/tiger.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;rglew32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;rglew32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;rglew32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>rglut32.lib;rglu32.lib;rglew32.lib;regal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/z.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

4
build/win32/vs2010/Regal/zlib.vcxproj
View file

@ -93,6 +93,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -133,6 +134,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -170,6 +172,7 @@
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -209,6 +212,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

6
include/GL/Regal.h
View file

@ -356,9 +356,9 @@ typedef uint64_t EGLuint64NV;
/* TODO: make this automatic? */
typedef void (*GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (*GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (*GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (REGAL_CALL *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (REGAL_CALL *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (REGAL_CALL *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (*GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, GLvoid *context);

40
scripts/EmuBaseVertex.py
View file

@ -2,11 +2,47 @@
baseVertexFormulae = {
'DrawElements' : {
'entries' : [ 'gl(Multi|)Draw(Range|)Elements(Instanced|)BaseVertex' ],
'entries' : [ 'gl(Multi|)Draw(Range|)Elements(Instanced|)BaseVertex(BaseInstance|)' ],
'impl' : [
'if( ! _context->bv->gl${m1}Draw${m2}Elements${m3}BaseVertex( *_context, ${arg0plus} ) ) {',
'if( ! _context->bv->gl${m1}Draw${m2}Elements${m3}BaseVertex${m4}( *_context, ${arg0plus} ) ) {',
' _context->dispatcher.emulation.gl${m1}Draw${m2}Elements${m3}BaseVertex( ${arg0plus} );',
'}',
],
},
'Bind' : {
'entries' : [ 'glBind(Vertex|)(Buffer|Array)' ],
'prefix' : [ '_context->bv->glBind${m1}${m2}( ${arg0plus} );', ],
},
'EnableDisable' : {
'entries' : [ 'gl(Enable|Disable)(ClientState|VertexAttribArray|)(i|Indexed|)(EXT|)' ],
'prefix' : [ '_context->bv->gl${m1}${m2}${m3}${m4}( ${arg0plus} );', ],
},
'Pointer' : {
'entries' : [ 'gl(Color|EdgeFlag|FogCoord|Index|Normal|SecondaryColor|TexCoord|Vertex)Pointer' ],
'prefix' : [ '_context->bv->gl${m1}Pointer( ${arg0plus} );', ],
},
'VertexAttrib' : {
'entries' : [ 'glVertexAttrib(I|L|)(Binding|Format)' ],
'prefix' : [ '_context->bv->glVertexAttrib${m1}${m2}( ${arg0plus} );', ],
},
'MultiTexCoordPointerEXT': {
'entries' : [ 'glMultiTexCoordPointerEXT' ],
'prefix' : [ '_context->bv->glMultiTexCoordPointerEXT( ${arg0plus} );', ],
},
'ClientActiveTexture' : {
'entries' : [ 'glClientActiveTexture' ],
'prefix' : [ '_context->bv->glClientActiveTexture( ${arg0plus} );', ],
},
'PrimitiveRestartIndex' : {
'entries' : [ 'glPrimitiveRestartIndex' ],
'prefix' : [ '_context->bv->glPrimitiveRestartIndex( ${arg0plus} );', ],
},
'VertexDivisor' : {
'entries' : [ 'glVertex(Attrib|Binding)Divisor' ],
'prefix' : [ '_context->bv->glVertex${m1}Divisor( ${arg0plus} );', ],
},
'VertexAttribPointer' : {
'entries' : [ 'glVertexAttrib(I|L|)Pointer' ],
'prefix' : [ '_context->bv->glVertexAttrib${m1}Pointer( ${arg0plus} );', ],
},
}

59
scripts/EmuDsa.py
View file

@ -418,13 +418,52 @@ dsaFormulae = {
'return _dispatch.call(&_dispatch.glUnmapBuffer)( GL_ARRAY_BUFFER );',
],
},
'DsaBufferPointerCommands' : {
'entries' : [ ],
# 'entries' : [ 'glVertexArray(Vertex|Color|EdgeFlag|Index|Normal|TexCoord|MultiTexCoord|FogCoord|SecondaryColor|VertexAttrib|VertexAttribI)OffsetEXT' ],
'DsaVertexArrayOffsetCommands3' : {
'entries' : [ 'glVertexArray(EdgeFlag)OffsetEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );'
'_context->dsa->DsaBuffer( _context, ${arg1} );',
'_dispatch.call(&_dispatch.gl${m1}Pointer)( ${arg2plus} );',
'_dispatch.call(&_dispatch.gl${m1}Pointer)( ${arg2}, reinterpret_cast<const GLvoid *>(${arg3}) );',
],
},
'DsaVertexArrayPointerOffsets4' : {
'entries' : [ 'glVertexArray(Index|Normal|FogCoord)OffsetEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );'
'_context->dsa->DsaBuffer( _context, ${arg1} );',
'_dispatch.call(&_dispatch.gl${m1}Pointer)( ${arg2}, ${arg3}, reinterpret_cast<const GLvoid *>(${arg4}) );',
],
},
'DsaVertexArrayOffsetCommands5' : {
'entries' : [ 'glVertexArray(Vertex|Color|TexCoord|SecondaryColor)OffsetEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );'
'_context->dsa->DsaBuffer( _context, ${arg1} );',
'_dispatch.call(&_dispatch.gl${m1}Pointer)( ${arg2}, ${arg3}, ${arg4}, reinterpret_cast<const GLvoid *>(${arg5}) );',
],
},
'DsaVertexArrayOffsetCommands6' : {
'entries' : [ 'glVertexArray(VertexAttribI)OffsetEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );'
'_context->dsa->DsaBuffer( _context, ${arg1} );',
'_dispatch.call(&_dispatch.gl${m1}Pointer)( ${arg2}, ${arg3}, ${arg4}, ${arg5}, reinterpret_cast<const GLvoid *>(${arg6}) );',
],
},
'DsaVertexArrayOffsetCommands6EXT' : {
'entries' : [ 'glVertexArray(MultiTexCoord)OffsetEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );'
'_context->dsa->DsaBuffer( _context, ${arg1} );',
'_dispatch.call(&_dispatch.gl${m1}PointerEXT)( ${arg2}, ${arg3}, ${arg4}, ${arg5}, reinterpret_cast<const GLvoid *>(${arg6}) );',
],
},
'DsaVertexArrayOffsetCommands7' : {
'entries' : [ 'glVertexArray(VertexAttrib)OffsetEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );'
'_context->dsa->DsaBuffer( _context, ${arg1} );',
'_dispatch.call(&_dispatch.gl${m1}Pointer)( ${arg2}, ${arg3}, ${arg4}, ${arg5}, ${arg6}, reinterpret_cast<const GLvoid *>(${arg7}) );',
],
},
'Delete' : {
@ -447,5 +486,17 @@ dsaFormulae = {
},
'prefix' : [ '_context->dsa->Delete${method}( _context, ${arg0plus} );', ],
},
'VertexArrayEnable' : {
'entries' : [ 'gl(Enable|Disable)VertexArrayEXT' ],
'impl' : [
'_context->dsa->DsaVao( _context, ${arg0} );',
'if ( ${arg1} >= GL_TEXTURE0 && ${arg1} <= GL_TEXTURE31) {',
' _context->dsa->DsaClientActiveTexture( _context, ${arg1} );',
' _dispatch.call(&_dispatch.gl${m1}ClientState)( GL_TEXTURE_COORD_ARRAY );',
'} else {',
' _dispatch.call(&_dispatch.gl${m1}ClientState)( ${arg1} );',
'}'
],
},
}

15
scripts/Export.py
View file

@ -90,13 +90,14 @@ regalLicense = '''
'''
emulatedExts = {
'GL_ARB_texture_storage': { 'emulatedBy' : 'texsto', 'emulatedIf' : '' },
'GL_EXT_blend_color': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_EXT_blend_subtract': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_EXT_direct_state_access': { 'emulatedBy' : 'dsa', 'emulatedIf' : '' },
'GL_EXT_framebuffer_blit': { 'emulatedBy' : 'filt', 'emulatedIf' : '(info->gl_version_major >= 3) || info->gl_nv_framebuffer_blit' },
'GL_EXT_framebuffer_object': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_NV_blend_square': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_ARB_texture_storage': { 'emulatedBy' : 'texsto', 'emulatedIf' : '' },
'GL_EXT_blend_color': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_EXT_blend_subtract': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_EXT_direct_state_access': { 'emulatedBy' : 'dsa', 'emulatedIf' : '' },
'GL_EXT_framebuffer_blit': { 'emulatedBy' : 'filt', 'emulatedIf' : '(info->gl_version_major >= 3) || info->gl_nv_framebuffer_blit' },
'GL_EXT_framebuffer_object': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_IBM_texture_mirrored_repeat': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
'GL_NV_blend_square': { 'emulatedBy' : 'filt', 'emulatedIf' : '' },
}

1
scripts/api/ApiRegal.py
View file

@ -93,6 +93,7 @@ def logParameter(function, parameter):
t in [ 'XID', 'XVisualInfo *', 'Pixmap', 'Font', 'Display *'] or \
t in [ 'GLXDrawble', 'GLXPixmap', 'GLXContext', 'GLXVideoDeviceNV', 'GLXWindow', 'GLXPbuffer', 'GLXFBConfigID', '__GLXextFuncPtr'] or \
t in [ 'PVOID', 'LPVOID', 'HDC', 'HGLRC', 'HPBUFFERARB', 'HPBUFFEREXT', 'HGPUNV', 'HPVIDEODEV', 'HVIDEOINPUTDEVICENV', 'HVIDEOOUTPUTDEVICENV', 'PGPU_DEVICE' ] or \
t in [ 'LPIXELFORMATDESCRIPTOR', 'LPLAYERPLANEDESCRIPTOR','LPLAYERPLANEDESCRIPTOR', 'LPGLYPHMETRICSFLOAT' ] or \
t in [ 'EGLNativeWindowType', 'EGLNativePixmapType', 'EGLNativeDisplayType', 'EGLConfig', 'EGLContext', 'EGLDisplay', 'EGLSurface', 'EGLClientBuffer', 'EGLSyncKHR', 'EGLImageKHR', 'EGLStreamKHR', 'EGLSyncNV']:
return 'boost::print::optional(%s,Logging::pointers)'%n

11
scripts/api/gl.py
View file

@ -1403,6 +1403,7 @@ GL_PACK_IMAGE_HEIGHT = Enumerant('GL_PACK_IMAGE_HEIGHT', 0x806c, 'GL_VERSION_1_2
GL_PACK_SKIP_IMAGES = Enumerant('GL_PACK_SKIP_IMAGES', 0x806b, 'GL_VERSION_1_2')
GL_PROXY_TEXTURE_3D = Enumerant('GL_PROXY_TEXTURE_3D', 0x8070, 'GL_VERSION_1_2')
GL_RESCALE_NORMAL = Enumerant('GL_RESCALE_NORMAL', 0x803a, 'GL_VERSION_1_2')
GL_RESCALE_NORMAL.enableCap = True
GL_SEPARATE_SPECULAR_COLOR = Enumerant('GL_SEPARATE_SPECULAR_COLOR', 0x81fa, 'GL_VERSION_1_2')
GL_SINGLE_COLOR = Enumerant('GL_SINGLE_COLOR', 0x81f9, 'GL_VERSION_1_2')
GL_SMOOTH_LINE_WIDTH_GRANULARITY = Enumerant('GL_SMOOTH_LINE_WIDTH_GRANULARITY', 0x0b23, 'GL_VERSION_1_2')
@ -14475,7 +14476,7 @@ gl.add(glShadeModel)
glStencilFunc = Function('glStencilFunc')
glStencilFunc.ret = Return('void')
glStencilFunc.add( Input( 'func','GLenum' ))
glStencilFunc.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(mask)' ))
glStencilFunc.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(ref)' ))
glStencilFunc.add( Input( 'mask','GLuint' ,regalLog = 'boost::print::hex(mask)' ))
glStencilFunc.version = '1.0'
glStencilFunc.category = 'GL_VERSION_1_0'
@ -17292,7 +17293,7 @@ glStencilFuncSeparate = Function('glStencilFuncSeparate')
glStencilFuncSeparate.ret = Return('void')
glStencilFuncSeparate.add( Input( 'face','GLenum' ))
glStencilFuncSeparate.add( Input( 'func','GLenum' ))
glStencilFuncSeparate.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(mask)' ))
glStencilFuncSeparate.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(ref)' ))
glStencilFuncSeparate.add( Input( 'mask','GLuint' ,regalLog = 'boost::print::hex(mask)' ))
glStencilFuncSeparate.version = '2.0'
glStencilFuncSeparate.category = 'GL_VERSION_2_0'
@ -26823,7 +26824,7 @@ glStencilFuncSeparateATI = Function('glStencilFuncSeparateATI')
glStencilFuncSeparateATI.ret = Return('void')
glStencilFuncSeparateATI.add( Input( 'frontfunc','GLenum' ))
glStencilFuncSeparateATI.add( Input( 'backfunc','GLenum' ))
glStencilFuncSeparateATI.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(mask)' ))
glStencilFuncSeparateATI.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(ref)' ))
glStencilFuncSeparateATI.add( Input( 'mask','GLuint' ,regalLog = 'boost::print::hex(mask)' ))
glStencilFuncSeparateATI.version = '1.2'
glStencilFuncSeparateATI.category = 'GL_ATI_separate_stencil'
@ -30109,7 +30110,7 @@ glNamedProgramStringEXT.add( Input( 'program','GLuint' ))
glNamedProgramStringEXT.add( Input( 'target','GLenum' ))
glNamedProgramStringEXT.add( Input( 'format','GLenum' ))
glNamedProgramStringEXT.add( Input( 'len','GLsizei' ))
glNamedProgramStringEXT.add( Input( 'string','const GLvoid *' ,size = 'len' ))
glNamedProgramStringEXT.add( Input( 'string','const GLvoid *' ,size = 'len' ,cast = 'const char *' ))
glNamedProgramStringEXT.version = '1.3'
glNamedProgramStringEXT.category = 'GL_EXT_direct_state_access'
glNamedProgramStringEXT.trace = True
@ -37144,7 +37145,7 @@ gl.add(glPathStencilDepthOffsetNV)
glPathStencilFuncNV = Function('glPathStencilFuncNV')
glPathStencilFuncNV.ret = Return('void')
glPathStencilFuncNV.add( Input( 'func','GLenum' ))
glPathStencilFuncNV.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(mask)' ))
glPathStencilFuncNV.add( Input( 'ref','GLint' ,regalLog = 'boost::print::hex(ref)' ))
glPathStencilFuncNV.add( Input( 'mask','GLuint' ,regalLog = 'boost::print::hex(mask)' ))
glPathStencilFuncNV.version = ''
glPathStencilFuncNV.category = 'GL_NV_path_rendering'

6
scripts/regal/Regal.py
View file

@ -112,9 +112,9 @@ ${API_TYPEDEF}
/* TODO: make this automatic? */
typedef void (*GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (*GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (*GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (REGAL_CALL *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (REGAL_CALL *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (REGAL_CALL *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, GLvoid *userParam);
typedef void (*GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, GLvoid *context);

4
scripts/regal/RegalDispatchEmu.py
View file

@ -92,7 +92,7 @@ def apiEmuFuncDefineCode(apis, args):
if l['plugin']:
code += ' #if REGAL_PLUGIN\n'
code += ' Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();\n'
code += ' Push<DispatchTable *> pushDispatchTable(_instance.nextDispatchTable);\n'
code += ' Push<DispatchTableGL *> pushDispatchTable(_instance.nextDispatchTable);\n'
code += ' _instance.nextDispatchTable = &_context->dispatcher.emulation;\n'
code += ' #endif\n'
@ -142,7 +142,7 @@ def apiEmuFuncDefineCode(apis, args):
if l['plugin']:
code += ' #if REGAL_PLUGIN\n'
code += ' Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();\n'
code += ' Push<DispatchTable *> pushDispatchTable(_instance.nextDispatchTable);\n'
code += ' Push<DispatchTableGL *> pushDispatchTable(_instance.nextDispatchTable);\n'
code += ' _instance.nextDispatchTable = &_context->dispatcher.emulation;\n'
code += ' #endif\n'

10
src/regal/Regal.cpp
View file

@ -2527,7 +2527,7 @@ extern "C" {
REGAL_DECL void REGAL_CALL glStencilFunc(GLenum func, GLint ref, GLuint mask)
{
RegalContext *_context = REGAL_GET_CONTEXT();
App("glStencilFunc","(", toString(func), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
App("glStencilFunc","(", toString(func), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
if (!_context) return;
DispatchTableGL *_next = &_context->dispatcher.front();
RegalAssert(_next);
@ -5109,7 +5109,7 @@ extern "C" {
REGAL_DECL void REGAL_CALL glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
{
RegalContext *_context = REGAL_GET_CONTEXT();
App("glStencilFuncSeparate","(", toString(face), ", ", toString(func), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
App("glStencilFuncSeparate","(", toString(face), ", ", toString(func), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
if (!_context) return;
DispatchTableGL *_next = &_context->dispatcher.front();
RegalAssert(_next);
@ -13537,7 +13537,7 @@ extern "C" {
REGAL_DECL void REGAL_CALL glStencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
{
RegalContext *_context = REGAL_GET_CONTEXT();
App("glStencilFuncSeparateATI","(", toString(frontfunc), ", ", toString(backfunc), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
App("glStencilFuncSeparateATI","(", toString(frontfunc), ", ", toString(backfunc), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
if (!_context) return;
DispatchTableGL *_next = &_context->dispatcher.front();
RegalAssert(_next);
@ -16297,7 +16297,7 @@ extern "C" {
REGAL_DECL void REGAL_CALL glNamedProgramStringEXT(GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string)
{
RegalContext *_context = REGAL_GET_CONTEXT();
App("glNamedProgramStringEXT","(", program, ", ", toString(target), ", ", toString(format), ", ", len, ", ", boost::print::optional(string,Logging::pointers), ")");
App("glNamedProgramStringEXT","(", program, ", ", toString(target), ", ", toString(format), ", ", len, ", ", boost::print::quote(reinterpret_cast<const char *>(string),'"'), ")");
if (!_context) return;
DispatchTableGL *_next = &_context->dispatcher.front();
RegalAssert(_next);
@ -22578,7 +22578,7 @@ extern "C" {
REGAL_DECL void REGAL_CALL glPathStencilFuncNV(GLenum func, GLint ref, GLuint mask)
{
RegalContext *_context = REGAL_GET_CONTEXT();
App("glPathStencilFuncNV","(", toString(func), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
App("glPathStencilFuncNV","(", toString(func), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
if (!_context) return;
DispatchTableGL *_next = &_context->dispatcher.front();
RegalAssert(_next);

165
src/regal/RegalBaseVertex.h
View file

@ -33,6 +33,10 @@
Regal Draw Elements Base Vertex emu layer
Nigel Stewart, Scott Nations
TODO:
- add logic to handle aliasing of named arrays onto generic arrays
*/
#ifndef __REGAL_BASEVERTEX_H__
@ -48,6 +52,7 @@ REGAL_GLOBAL_BEGIN
#include <GL/Regal.h>
#include "RegalClientState.h"
#include "RegalEmu.h"
#include "RegalContext.h"
#include "RegalContextInfo.h"
@ -58,9 +63,7 @@ REGAL_NAMESPACE_BEGIN
namespace Emu {
// Work in progress...
struct BaseVertex
struct BaseVertex : public Client::State::VertexArray
{
void Init(RegalContext &ctx)
{
@ -72,54 +75,144 @@ struct BaseVertex
UNUSED_PARAMETER(ctx);
}
bool glDrawElementsBaseVertex(RegalContext &ctx, GLenum mode, GLsizei count, GLenum type, GLvoid *indices, GLint basevertex)
void adjust(RegalContext &ctx, DispatchTableGL &dt, GLint basevertex)
{
UNUSED_PARAMETER(ctx);
UNUSED_PARAMETER(mode);
UNUSED_PARAMETER(count);
UNUSED_PARAMETER(type);
UNUSED_PARAMETER(indices);
UNUSED_PARAMETER(basevertex);
return false;
GLuint currentVBO = Client::State::VertexArray::arrayBufferBinding;
for (GLuint ii=0; ii<Client::State::nNamedArrays; ii++)
{
Client::State::NamedVertexArray &n = Client::State::VertexArray::named[ii];
if (n.enabled)
{
if (currentVBO != n.buffer)
{
currentVBO = n.buffer;
dt.call(&dt.glBindBuffer)(GL_ARRAY_BUFFER, currentVBO);
}
if (ii < 7)
{
switch (ii)
{
case Client::State::VERTEX:
dt.call(&dt.glVertexPointer)(n.size, n.type, n.stride, n.pointer);
break;
case Client::State::NORMAL:
dt.call(&dt.glNormalPointer)(n.type, n.stride, n.pointer);
break;
case Client::State::FOG_COORD:
dt.call(&dt.glFogCoordPointer)(n.type, n.stride, n.pointer);
break;
case Client::State::COLOR:
dt.call(&dt.glColorPointer)(n.size, n.type, n.stride, n.pointer);
break;
case Client::State::SECONDARY_COLOR:
dt.call(&dt.glSecondaryColorPointer)(n.size, n.type, n.stride, n.pointer);
break;
case Client::State::INDEX:
dt.call(&dt.glIndexPointer)(n.type, n.stride, n.pointer);
break;
case Client::State::EDGE_FLAG:
dt.call(&dt.glEdgeFlagPointer)(n.stride, n.pointer);
break;
default:
break;
}
}
else
{
GLuint index = static_cast<GLuint>(ii - 7);
dt.call(&dt.glMultiTexCoordPointerEXT)(GL_TEXTURE0+index, n.size, n.type, n.stride, n.pointer);
}
}
}
for (GLuint ii=0; ii<REGAL_EMU_MAX_VERTEX_ATTRIBS; ii++)
{
Client::State::GenericVertexArray &g = Client::State::VertexArray::generic[ii];
if (g.enabled)
{
Client::State::VertexBufferBindPoint &b = Client::State::VertexArray::bindings[g.bindingIndex];
GLvoid *p = reinterpret_cast<GLvoid *>(b.offset + (b.stride*basevertex));
if (currentVBO != b.buffer)
{
currentVBO = b.buffer;
dt.call(&dt.glBindBuffer)(GL_ARRAY_BUFFER, currentVBO);
}
if (g.isInteger)
dt.call(&dt.glVertexAttribIPointer)(ii, g.size, g.type, b.stride, p);
else if (g.isLong)
dt.call(&dt.glVertexAttribLPointer)(ii, g.size, g.type, b.stride, p);
else
dt.call(&dt.glVertexAttribPointer)(ii, g.size, g.type, g.normalized, b.stride, p);
}
}
if (currentVBO != Client::State::VertexArray::arrayBufferBinding)
dt.call(&dt.glBindBuffer)(GL_ARRAY_BUFFER, Client::State::VertexArray::arrayBufferBinding);
}
bool glDrawElementsBaseVertex(RegalContext &ctx, GLenum mode, GLsizei count, GLenum type, GLvoid *indices, GLint basevertex)
{
DispatchTableGL &dt = ctx.dispatcher.emulation;
if (basevertex)
adjust(ctx, dt, basevertex);
dt.call(&dt.glDrawElements)(mode, count, type, indices);
if (basevertex)
adjust(ctx, dt, 0);
return true;
}
bool glDrawRangeElementsBaseVertex(RegalContext &ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices, GLint basevertex)
{
UNUSED_PARAMETER(ctx);
UNUSED_PARAMETER(mode);
UNUSED_PARAMETER(start);
UNUSED_PARAMETER(end);
UNUSED_PARAMETER(count);
UNUSED_PARAMETER(type);
UNUSED_PARAMETER(indices);
UNUSED_PARAMETER(basevertex);
return false;
DispatchTableGL &dt = ctx.dispatcher.emulation;
if (basevertex)
adjust(ctx, dt, basevertex);
dt.call(&dt.glDrawRangeElements)(mode, start, end, count, type, indices);
if (basevertex)
adjust(ctx, dt, 0);
return true;
}
bool glDrawElementsInstancedBaseVertex(RegalContext &ctx, GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex)
{
UNUSED_PARAMETER(ctx);
UNUSED_PARAMETER(mode);
UNUSED_PARAMETER(count);
UNUSED_PARAMETER(type);
UNUSED_PARAMETER(indices);
UNUSED_PARAMETER(primcount);
UNUSED_PARAMETER(basevertex);
return false;
DispatchTableGL &dt = ctx.dispatcher.emulation;
if (basevertex)
adjust(ctx, dt, basevertex);
dt.call(&dt.glDrawElementsInstanced)(mode, count, type, indices, primcount);
if (basevertex)
adjust(ctx, dt, 0);
return true;
}
bool glDrawElementsInstancedBaseVertexBaseInstance(RegalContext &ctx, GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance)
{
DispatchTableGL &dt = ctx.dispatcher.emulation;
if (basevertex)
adjust(ctx, dt, basevertex);
dt.call(&dt.glDrawElementsInstancedBaseInstance)(mode, count, type, indices, primcount, baseinstance);
if (basevertex)
adjust(ctx, dt, 0);
return true;
}
bool glMultiDrawElementsBaseVertex(RegalContext &ctx, GLenum mode, const GLsizei *count, GLenum type, const GLvoid * const* indices, GLsizei primcount, const GLint *basevertex)
{
UNUSED_PARAMETER(ctx);
UNUSED_PARAMETER(mode);
UNUSED_PARAMETER(count);
UNUSED_PARAMETER(type);
UNUSED_PARAMETER(indices);
UNUSED_PARAMETER(primcount);
UNUSED_PARAMETER(basevertex);
return false;
DispatchTableGL &dt = ctx.dispatcher.emulation;
for (GLsizei ii=0; ii<primcount; ii++)
{
if (basevertex[ii])
adjust(ctx, dt, basevertex[ii]);
dt.call(&dt.glDrawElements)(mode, count[ii], type, indices[ii]);
if (basevertex[ii])
adjust(ctx, dt, 0);
}
return true;
}
};
}

123
src/regal/RegalClientState.h
View file

@ -82,8 +82,16 @@ REGAL_NAMESPACE_BEGIN
// SIGGRAPH 2002
// http://graphics.stanford.edu/papers/cr/
//
// TODO:
//
// - handle glInterleavedArrays
// - handle DSA VertexArray*OffsetEXT (maybe)
//
namespace ClientState
namespace Client
{
namespace State
{
using ::boost::print::hex;
@ -134,7 +142,7 @@ namespace ClientState
TEX_COORD = 7
} vaName;
GLenum vaEnum[][6] =
const GLenum vaEnum[][6] =
{
{ GL_VERTEX_ARRAY, GL_VERTEX_ARRAY_POINTER, GL_VERTEX_ARRAY_BUFFER_BINDING, GL_VERTEX_ARRAY_SIZE, GL_VERTEX_ARRAY_TYPE, GL_VERTEX_ARRAY_STRIDE },
{ GL_NORMAL_ARRAY, GL_NORMAL_ARRAY_POINTER, GL_NORMAL_ARRAY_BUFFER_BINDING, GL_ZERO, GL_NORMAL_ARRAY_TYPE, GL_NORMAL_ARRAY_STRIDE },
@ -629,6 +637,16 @@ namespace ClientState
SetEnablei(cap, index, GL_FALSE);
}
inline void glEnableIndexedEXT(GLenum cap, GLuint index)
{
SetEnablei(cap, index, GL_TRUE);
}
inline void glDisableIndexedEXT(GLenum cap, GLuint index)
{
SetEnablei(cap, index, GL_FALSE);
}
void SetEnableClientStatei(GLenum cap, GLuint index, GLboolean enabled)
{
// only handle these if no VAO is bound
@ -677,17 +695,27 @@ namespace ClientState
SetEnableClientStatei(cap, 0, GL_FALSE);
}
inline void glEnableClientStatei(GLenum cap, GLuint index)
inline void glEnableClientStateiEXT(GLenum cap, GLuint index)
{
SetEnableClientStatei(cap, index, GL_TRUE);
}
inline void glDisableClientStatei(GLenum cap, GLuint index)
inline void glDisableClientStateiEXT(GLenum cap, GLuint index)
{
SetEnableClientStatei(cap, index, GL_FALSE);
}
void BindBuffer( GLenum target, GLuint buffer )
inline void glEnableClientStateIndexedEXT(GLenum cap, GLuint index)
{
SetEnableClientStatei(cap, index, GL_TRUE);
}
inline void glDisableClientStateIndexedEXT(GLenum cap, GLuint index)
{
SetEnableClientStatei(cap, index, GL_FALSE);
}
void glBindBuffer( GLenum target, GLuint buffer )
{
switch (target)
{
@ -800,6 +828,80 @@ namespace ClientState
glMultiTexCoordPointerEXT(clientActiveTexture,size,type,stride,pointer);
}
GLsizei computeEffectiveStride(GLsizei stride, GLint size, GLenum type)
{
if (stride != 0)
return stride;
// when stride == 0, compute effectiveStride based on size and type
if (size == GL_BGRA)
return 4;
switch (type)
{
case GL_BYTE:
case GL_UNSIGNED_BYTE:
break;
case GL_INT_2_10_10_10_REV:
case GL_UNSIGNED_INT_2_10_10_10_REV:
// size must be 4 for these. Just return that.
break;
case GL_SHORT:
case GL_UNSIGNED_SHORT:
case GL_HALF_FLOAT:
size *= 2;
break;
case GL_INT:
case GL_UNSIGNED_INT:
case GL_FLOAT:
case GL_FIXED:
size *= 4;
break;
case GL_DOUBLE:
size *= 8;
break;
default:
size = 0;
break;
}
return size;
}
void glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer)
{
if (!vertexArrayBinding)
{
glVertexAttribFormat(index, size, type, normalized, 0);
glVertexAttribBinding(index, index);
GLsizei effectiveStride = computeEffectiveStride(stride, size, type);
glBindVertexBuffer(index, arrayBufferBinding, (char *)pointer - (char *)NULL, effectiveStride);
}
}
void glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
{
if (!vertexArrayBinding)
{
glVertexAttribIFormat(index, size, type, 0);
glVertexAttribBinding(index, index);
GLsizei effectiveStride = computeEffectiveStride(stride, size, type);
glBindVertexBuffer(index, arrayBufferBinding, (char *)pointer - (char *)NULL, effectiveStride);
}
}
void glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
{
if (!vertexArrayBinding)
{
glVertexAttribLFormat(index, size, type, 0);
glVertexAttribBinding(index, index);
GLsizei effectiveStride = computeEffectiveStride(stride, size, type);
glBindVertexBuffer(index, arrayBufferBinding, (char *)pointer - (char *)NULL, effectiveStride);
}
}
void glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
{
if (!vertexArrayBinding)
@ -810,6 +912,15 @@ namespace ClientState
}
}
inline void glVertexAttribDivisor(GLuint index, GLuint divisor)
{
if (!vertexArrayBinding)
{
generic[index].bindingIndex = index;
bindings[index].divisor = divisor;
}
}
inline void glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
{
if (!vertexArrayBinding)
@ -890,6 +1001,8 @@ namespace ClientState
};
}
}
REGAL_NAMESPACE_END
#endif

6
src/regal/RegalContext.cpp
View file

@ -212,6 +212,12 @@ RegalContext::Init()
info->regal_ext_framebuffer_object = true;
info->regalExtensionsSet.insert("GL_EXT_framebuffer_object");
}
if (!info->gl_ibm_texture_mirrored_repeat)
{
Internal("RegalContext::Init ","GL_IBM_texture_mirrored_repeat");
info->regal_ibm_texture_mirrored_repeat = true;
info->regalExtensionsSet.insert("GL_IBM_texture_mirrored_repeat");
}
if (!info->gl_nv_blend_square)
{
Internal("RegalContext::Init ","GL_NV_blend_square");

3
src/regal/RegalContextInfo.cpp
View file

@ -621,6 +621,7 @@ ContextInfo::ContextInfo()
regal_ext_direct_state_access(false),
regal_ext_framebuffer_blit(false),
regal_ext_framebuffer_object(false),
regal_ibm_texture_mirrored_repeat(false),
regal_nv_blend_square(false),
#if REGAL_SYS_WGL
wgl_3dl_stereo_control(false),
@ -1982,7 +1983,7 @@ ContextInfo::getExtension(const char *ext) const
if (!strcmp(ext,"GL_IBM_multimode_draw_arrays")) return gl_ibm_multimode_draw_arrays;
if (!strcmp(ext,"GL_IBM_rasterpos_clip")) return gl_ibm_rasterpos_clip;
if (!strcmp(ext,"GL_IBM_static_data")) return gl_ibm_static_data;
if (!strcmp(ext,"GL_IBM_texture_mirrored_repeat")) return gl_ibm_texture_mirrored_repeat;
if (!strcmp(ext,"GL_IBM_texture_mirrored_repeat")) return regal_ibm_texture_mirrored_repeat || gl_ibm_texture_mirrored_repeat;
if (!strcmp(ext,"GL_IBM_vertex_array_lists")) return gl_ibm_vertex_array_lists;
if (!strcmp(ext,"GL_IMG_multisampled_render_to_texture")) return gl_img_multisampled_render_to_texture;
if (!strcmp(ext,"GL_IMG_program_binary")) return gl_img_program_binary;

1
src/regal/RegalContextInfo.h
View file

@ -649,6 +649,7 @@ struct ContextInfo
GLboolean regal_ext_direct_state_access : 1;
GLboolean regal_ext_framebuffer_blit : 1;
GLboolean regal_ext_framebuffer_object : 1;
GLboolean regal_ibm_texture_mirrored_repeat : 1;
GLboolean regal_nv_blend_square : 1;
#if REGAL_SYS_WGL

10
src/regal/RegalDispatchCode.cpp
View file

@ -4049,7 +4049,7 @@ static void REGAL_CALL code_glStencilFunc(GLenum func, GLint ref, GLuint mask)
string_list< ::std::string > _code;
_code << indent << "glStencilFunc(";
_code << toString(func);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ", "; _code << "0x" << boost::print::hex(ref);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ");\n";
if (_context->codeSource)
@ -8803,7 +8803,7 @@ static void REGAL_CALL code_glStencilFuncSeparate(GLenum face, GLenum func, GLin
_code << indent << "glStencilFuncSeparate(";
_code << toString(face);
_code << ", "; _code << toString(func);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ", "; _code << "0x" << boost::print::hex(ref);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ");\n";
if (_context->codeSource)
@ -24397,7 +24397,7 @@ static void REGAL_CALL code_glStencilFuncSeparateATI(GLenum frontfunc, GLenum ba
_code << indent << "glStencilFuncSeparateATI(";
_code << toString(frontfunc);
_code << ", "; _code << toString(backfunc);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ", "; _code << "0x" << boost::print::hex(ref);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ");\n";
if (_context->codeSource)
@ -29669,7 +29669,7 @@ static void REGAL_CALL code_glNamedProgramStringEXT(GLuint program, GLenum targe
_code << ", "; _code << toString(target);
_code << ", "; _code << toString(format);
_code << ", "; _code << len;
_code << ", "; _code << string;
_code << ", "; _code << boost::print::quote(reinterpret_cast<const char *>(string),'"');
_code << ");\n";
if (_context->codeSource)
fprintf(_context->codeSource,"%s",_code.str().c_str());
@ -41214,7 +41214,7 @@ static void REGAL_CALL code_glPathStencilFuncNV(GLenum func, GLint ref, GLuint m
string_list< ::std::string > _code;
_code << indent << "glPathStencilFuncNV(";
_code << toString(func);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ", "; _code << "0x" << boost::print::hex(ref);
_code << ", "; _code << "0x" << boost::print::hex(mask);
_code << ");\n";
if (_context->codeSource)

991
src/regal/RegalDispatchEmu.cpp
View file

File diff suppressed because it is too large Load diff

14
src/regal/RegalDispatchLog.cpp
View file

@ -2366,7 +2366,7 @@ static void REGAL_CALL log_glStencilFunc(GLenum func, GLint ref, GLuint mask)
DispatchTableGL *_next = _context->dispatcher.logging.next();
RegalAssert(_next);
_next->call(&_next->glStencilFunc)(func, ref, mask);
Driver("glStencilFunc","(", toString(func), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
Driver("glStencilFunc","(", toString(func), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
}
static void REGAL_CALL log_glStencilMask(GLuint mask)
@ -4950,7 +4950,7 @@ static void REGAL_CALL log_glStencilFuncSeparate(GLenum face, GLenum func, GLint
DispatchTableGL *_next = _context->dispatcher.logging.next();
RegalAssert(_next);
_next->call(&_next->glStencilFuncSeparate)(face, func, ref, mask);
Driver("glStencilFuncSeparate","(", toString(face), ", ", toString(func), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
Driver("glStencilFuncSeparate","(", toString(face), ", ", toString(func), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
}
static void REGAL_CALL log_glStencilMaskSeparate(GLenum face, GLuint mask)
@ -13422,7 +13422,7 @@ static void REGAL_CALL log_glStencilFuncSeparateATI(GLenum frontfunc, GLenum bac
DispatchTableGL *_next = _context->dispatcher.logging.next();
RegalAssert(_next);
_next->call(&_next->glStencilFuncSeparateATI)(frontfunc, backfunc, ref, mask);
Driver("glStencilFuncSeparateATI","(", toString(frontfunc), ", ", toString(backfunc), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
Driver("glStencilFuncSeparateATI","(", toString(frontfunc), ", ", toString(backfunc), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
}
static void REGAL_CALL log_glStencilOpSeparateATI(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
@ -16165,7 +16165,7 @@ static void REGAL_CALL log_glNamedProgramStringEXT(GLuint program, GLenum target
DispatchTableGL *_next = _context->dispatcher.logging.next();
RegalAssert(_next);
_next->call(&_next->glNamedProgramStringEXT)(program, target, format, len, string);
Driver("glNamedProgramStringEXT","(", program, ", ", toString(target), ", ", toString(format), ", ", len, ", ", boost::print::optional(string,Logging::pointers), ")");
Driver("glNamedProgramStringEXT","(", program, ", ", toString(target), ", ", toString(format), ", ", len, ", ", boost::print::quote(reinterpret_cast<const char *>(string),'"'), ")");
}
static void REGAL_CALL log_glNamedRenderbufferStorageEXT(GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height)
@ -22449,7 +22449,7 @@ static void REGAL_CALL log_glPathStencilFuncNV(GLenum func, GLint ref, GLuint ma
DispatchTableGL *_next = _context->dispatcher.logging.next();
RegalAssert(_next);
_next->call(&_next->glPathStencilFuncNV)(func, ref, mask);
Driver("glPathStencilFuncNV","(", toString(func), ", ", boost::print::hex(mask), ", ", boost::print::hex(mask), ")");
Driver("glPathStencilFuncNV","(", toString(func), ", ", boost::print::hex(ref), ", ", boost::print::hex(mask), ")");
}
static void REGAL_CALL log_glPathStringNV(GLuint path, GLenum format, GLsizei length, const GLvoid *pathString)
@ -28458,7 +28458,7 @@ static BOOL REGAL_CALL log_wglUseFontOutlinesA(HDC hDC, DWORD first, DWORD count
DispatchTableGlobal *_next = dispatcherGlobal.logging.next();
RegalAssert(_next);
BOOL ret = _next->call(&_next->wglUseFontOutlinesA)(hDC, first, count, listBase, deviation, extrusion, format, lpgmf);
Driver("wglUseFontOutlinesA","(", boost::print::optional(hDC,Logging::pointers), ", ", first, ", ", count, ", ", listBase, ", ", deviation, ", ", extrusion, ", ", format, ", ", lpgmf, ")", " returned ", ret);
Driver("wglUseFontOutlinesA","(", boost::print::optional(hDC,Logging::pointers), ", ", first, ", ", count, ", ", listBase, ", ", deviation, ", ", extrusion, ", ", format, ", ", boost::print::optional(lpgmf,Logging::pointers), ")", " returned ", ret);
return ret;
}
@ -28467,7 +28467,7 @@ static BOOL REGAL_CALL log_wglUseFontOutlinesW(HDC hDC, DWORD first, DWORD count
DispatchTableGlobal *_next = dispatcherGlobal.logging.next();
RegalAssert(_next);
BOOL ret = _next->call(&_next->wglUseFontOutlinesW)(hDC, first, count, listBase, deviation, extrusion, format, lpgmf);
Driver("wglUseFontOutlinesW","(", boost::print::optional(hDC,Logging::pointers), ", ", first, ", ", count, ", ", listBase, ", ", deviation, ", ", extrusion, ", ", format, ", ", lpgmf, ")", " returned ", ret);
Driver("wglUseFontOutlinesW","(", boost::print::optional(hDC,Logging::pointers), ", ", first, ", ", count, ", ", listBase, ", ", deviation, ", ", extrusion, ", ", format, ", ", boost::print::optional(lpgmf,Logging::pointers), ")", " returned ", ret);
return ret;
}

2
src/regal/RegalDispatchStatistics.cpp
View file

@ -846,6 +846,7 @@ static void REGAL_CALL statistics_glDisable(GLenum cap)
case GL_POLYGON_SMOOTH: statistics.disable_GL_POLYGON_SMOOTH++; break;
case GL_SCISSOR_TEST: statistics.disable_GL_SCISSOR_TEST++; break;
case GL_STENCIL_TEST: statistics.disable_GL_STENCIL_TEST++; break;
case GL_RESCALE_NORMAL: statistics.disable_GL_RESCALE_NORMAL++; break;
case GL_MULTISAMPLE: statistics.disable_GL_MULTISAMPLE++; break;
case GL_SAMPLE_ALPHA_TO_COVERAGE: statistics.disable_GL_SAMPLE_ALPHA_TO_COVERAGE++; break;
case GL_SAMPLE_ALPHA_TO_ONE: statistics.disable_GL_SAMPLE_ALPHA_TO_ONE++; break;
@ -955,6 +956,7 @@ static void REGAL_CALL statistics_glEnable(GLenum cap)
case GL_POLYGON_SMOOTH: statistics.enable_GL_POLYGON_SMOOTH++; break;
case GL_SCISSOR_TEST: statistics.enable_GL_SCISSOR_TEST++; break;
case GL_STENCIL_TEST: statistics.enable_GL_STENCIL_TEST++; break;
case GL_RESCALE_NORMAL: statistics.enable_GL_RESCALE_NORMAL++; break;
case GL_MULTISAMPLE: statistics.enable_GL_MULTISAMPLE++; break;
case GL_SAMPLE_ALPHA_TO_COVERAGE: statistics.enable_GL_SAMPLE_ALPHA_TO_COVERAGE++; break;
case GL_SAMPLE_ALPHA_TO_ONE: statistics.enable_GL_SAMPLE_ALPHA_TO_ONE++; break;

2
src/regal/RegalStatistics.cpp
View file

@ -4911,6 +4911,7 @@ Statistics::log() const
log("glEnable(GL_POLYGON_SMOOTH)",enable_GL_POLYGON_SMOOTH);
log("glEnable(GL_SCISSOR_TEST)",enable_GL_SCISSOR_TEST);
log("glEnable(GL_STENCIL_TEST)",enable_GL_STENCIL_TEST);
log("glEnable(GL_RESCALE_NORMAL)",enable_GL_RESCALE_NORMAL);
log("glEnable(GL_MULTISAMPLE)",enable_GL_MULTISAMPLE);
log("glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE)",enable_GL_SAMPLE_ALPHA_TO_COVERAGE);
log("glEnable(GL_SAMPLE_ALPHA_TO_ONE)",enable_GL_SAMPLE_ALPHA_TO_ONE);
@ -4946,6 +4947,7 @@ Statistics::log() const
log("glDisable(GL_POLYGON_SMOOTH)",disable_GL_POLYGON_SMOOTH);
log("glDisable(GL_SCISSOR_TEST)",disable_GL_SCISSOR_TEST);
log("glDisable(GL_STENCIL_TEST)",disable_GL_STENCIL_TEST);
log("glDisable(GL_RESCALE_NORMAL)",disable_GL_RESCALE_NORMAL);
log("glDisable(GL_MULTISAMPLE)",disable_GL_MULTISAMPLE);
log("glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE)",disable_GL_SAMPLE_ALPHA_TO_COVERAGE);
log("glDisable(GL_SAMPLE_ALPHA_TO_ONE)",disable_GL_SAMPLE_ALPHA_TO_ONE);

2
src/regal/RegalStatistics.h
View file

@ -4896,6 +4896,7 @@ struct Statistics
GLuint enable_GL_POLYGON_SMOOTH;
GLuint enable_GL_SCISSOR_TEST;
GLuint enable_GL_STENCIL_TEST;
GLuint enable_GL_RESCALE_NORMAL;
GLuint enable_GL_MULTISAMPLE;
GLuint enable_GL_SAMPLE_ALPHA_TO_COVERAGE;
GLuint enable_GL_SAMPLE_ALPHA_TO_ONE;
@ -4931,6 +4932,7 @@ struct Statistics
GLuint disable_GL_POLYGON_SMOOTH;
GLuint disable_GL_SCISSOR_TEST;
GLuint disable_GL_STENCIL_TEST;
GLuint disable_GL_RESCALE_NORMAL;
GLuint disable_GL_MULTISAMPLE;
GLuint disable_GL_SAMPLE_ALPHA_TO_COVERAGE;
GLuint disable_GL_SAMPLE_ALPHA_TO_ONE;