Permalink
Browse files

Fixed function emulation improvements - push/pop attrib.

  • Loading branch information...
1 parent 3f42950 commit 52a5e6ffddc15b459b3e7cac31ab847e76ce3b07 @nigels-com nigels-com committed Oct 11, 2012
@@ -370,6 +370,8 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
+ "REGAL_NO_HTTP=1",
+ "REGAL_NO_PNG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -398,6 +400,10 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "REGAL_NO_HTTP=1",
+ "REGAL_NO_PNG=1",
+ );
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -288,6 +288,9 @@
<ClInclude Include="..\..\..\..\src\regal\pch.h" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\..\..\include\GL\Regal.h" />
+ </ItemGroup>
+ <ItemGroup>
<None Include="..\..\..\..\src\regal\Regal.def" />
</ItemGroup>
@@ -228,6 +228,9 @@
<ItemGroup>
<ClCompile Include="..\..\..\..\src\glew\src\glew.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\include\GL\RegalGLEW.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -228,6 +228,9 @@
<ItemGroup>
<ClCompile Include="..\..\..\..\src\glew\src\glew.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\include\GL\RegalGLEW.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -317,6 +317,9 @@
<ClCompile Include="..\..\..\..\src\glu\libutil\registry.c" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\..\..\include\GL\RegalGLU.h" />
+ </ItemGroup>
+ <ItemGroup>
<None Include="..\..\..\..\src\glu\glu.def" />
</ItemGroup>
@@ -316,6 +316,9 @@
<ClCompile Include="..\..\..\..\src\glu\libutil\quad.c" />
<ClCompile Include="..\..\..\..\src\glu\libutil\registry.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\include\GL\RegalGLU.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -277,6 +277,9 @@
<ClCompile Include="..\..\..\..\src\glut\src\win32_x11.c" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\..\..\include\GL\RegalGLUT.h" />
+ </ItemGroup>
+ <ItemGroup>
<None Include="..\..\..\..\src\glut\src\glut.def" />
</ItemGroup>
@@ -276,6 +276,9 @@
<ClCompile Include="..\..\..\..\src\glut\src\win32_winproc.c" />
<ClCompile Include="..\..\..\..\src\glut\src\win32_x11.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\include\GL\RegalGLUT.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -287,6 +287,9 @@
<ClInclude Include="..\..\..\..\src\regal\linear.h" />
<ClInclude Include="..\..\..\..\src\regal\pch.h" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\include\GL\Regal.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -288,6 +288,9 @@
<ClInclude Include="..\..\..\..\src\regal\pch.h" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\..\..\include\GL\Regal.h" />
+ </ItemGroup>
+ <ItemGroup>
<None Include="..\..\..\..\src\regal\Regalm.def" />
</ItemGroup>
@@ -287,6 +287,9 @@
<ClInclude Include="..\..\..\..\src\regal\linear.h" />
<ClInclude Include="..\..\..\..\src\regal\pch.h" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\include\GL\Regal.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -228,6 +228,9 @@
<ItemGroup>
<ClCompile Include="..\..\..\..\src\md5\src\md5.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\src\md5\include\md5.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -243,6 +243,11 @@
<ClCompile Include="..\..\..\..\src\libpng\src\pngwutil.c" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\..\..\src\libpng\include\png.h" />
+ <None Include="..\..\..\..\src\libpng\include\pngconf.h" />
+ <None Include="..\..\..\..\src\libpng\include\pnglibconf.h" />
+ </ItemGroup>
+ <ItemGroup>
<None Include="..\..\..\..\src\libpng\src\libpng.def" />
</ItemGroup>
@@ -243,6 +243,11 @@
<ClCompile Include="..\..\..\..\src\libpng\src\pngwtran.c" />
<ClCompile Include="..\..\..\..\src\libpng\src\pngwutil.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\src\libpng\include\png.h" />
+ <None Include="..\..\..\..\src\libpng\include\pngconf.h" />
+ <None Include="..\..\..\..\src\libpng\include\pnglibconf.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -243,6 +243,10 @@
<ClCompile Include="..\..\..\..\src\zlib\src\zutil.c" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\..\..\src\zlib\include\zconf.h" />
+ <None Include="..\..\..\..\src\zlib\include\zlib.h" />
+ </ItemGroup>
+ <ItemGroup>
<None Include="..\..\..\..\src\zlib\src\zlib.def" />
</ItemGroup>
@@ -242,6 +242,10 @@
<ClCompile Include="..\..\..\..\src\zlib\src\uncompr.c" />
<ClCompile Include="..\..\..\..\src\zlib\src\zutil.c" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\src\zlib\include\zconf.h" />
+ <None Include="..\..\..\..\src\zlib\include\zlib.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
View
@@ -8,6 +8,7 @@
'ForceCoreMac' : {
'entries' : [ 'CGLChoosePixelFormat' ],
'impl' : [
+ 'Init::init();',
'static const CGLPixelFormatAttribute nattribs[] = {',
' kCGLPFAOpenGLProfile,',
' (CGLPixelFormatAttribute)0x3200,',
View
@@ -9,9 +9,21 @@
'entries' : [ 'glPopAttrib' ],
'impl' : [ '_context->ppa->PopAttrib( _context );', ],
},
+ 'Get' : {
+ 'entries' : [ 'glGet(Integer|Float|Boolean)v' ],
+ 'impl' : [
+ 'if( ! _context->ppa->Get( _context, ${arg0plus} ) ) {',
+ ' _context->dispatcher.emulation.glGet${m1}v( ${arg0plus} );',
+ '}',
+ ],
+ },
'Enable' : {
'entries' : [ 'gl(Enable|Disable)' ],
- 'prefix' : [ '_context->ppa->${m1}( ${arg0plus} );', ],
+ 'impl' : [
+ 'if( ! _context->ppa->${m1}( _context, ${arg0} ) ) {',
+ ' _context->dispatcher.emulation.gl${m1}( ${arg0} );',
+ '}',
+ ],
},
'TrackDepth' : {
'entries' : [ '(glClearDepth|glDepthFunc|glDepthMask)' ],
@@ -25,4 +37,12 @@
'entries' : [ '(glCullFace|glFrontFace|glPolygonMode|glPolygonOffset)' ],
'prefix' : [ '_context->ppa->${m1}( ${arg0plus} );', ],
},
+ 'TrackDrawBuffer' : {
+ 'entries' : [ 'glDrawBuffer(s|)' ],
+ 'impl' : [
+ 'if( ! _context->info->core && !_context->info->gles ) {',
+ ' _context->dispatcher.emulation.glDrawBuffer${m1}( ${arg0plus} );',
+ '}',
+ ],
+ },
}
Oops, something went wrong.

0 comments on commit 52a5e6f

Please sign in to comment.