diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2017-01-10 08:54:33 -0800 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2017-01-10 08:54:33 -0800 |
| commit | 9fca03e6fd799107cf22aa2789710474f28caea3 (patch) | |
| tree | 870868b94e2d6384cdd056274a3d9b560bd47c5a /VisualC | |
| parent | 6fcde180354294c6463db474727dc8a6a6c6dc21 (diff) | |
Fixed bugs 2570, 3145, improved OpenGL ES context support on Windows and X11
Mark Callow
The attached patch does the following for the X11 and Windows platforms, the only ones where SDL attempts to use context_create_es_profile:
- Adds SDL_HINT_OPENGL_ES_DRIVER by which the application can
say to use the OpenGL ES driver & EGL rather than the Open GL
driver. (For bug #2570)
- Adds code to {WIN,X11}_GL_InitExtensions to determine the maximum
OpenGL ES version supported by the OpenGL driver (for bug #3145)
- Modifies the test that determines whether to use the OpenGL
driver or the real OpenGL ES driver to take into account the
hint, the requested and supported ES version and whether ES 1.X
is being requested. (For bug #2570 & bug #3145)
- Enables the testgles2 test for __WINDOWS__ and __LINUX__ and adds
the test to the VisualC projects.
With the fix in place I have run testdraw2, testgl and testgles2 without any issues and have run my own apps that use OpenGL, OpenGL ES 3 and OpenGL ES 1.1.
Diffstat (limited to 'VisualC')
| -rw-r--r-- | VisualC/tests/testgles2/testgles2.vcxproj | 8 | ||||
| -rw-r--r-- | VisualC/tests/testgles2/testgles2_VS2008.vcproj | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/VisualC/tests/testgles2/testgles2.vcxproj b/VisualC/tests/testgles2/testgles2.vcxproj index 186f6affd6..f1c633a439 100644 --- a/VisualC/tests/testgles2/testgles2.vcxproj +++ b/VisualC/tests/testgles2/testgles2.vcxproj @@ -189,6 +189,12 @@ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
+ <Private>false</Private>
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\test\testgles2.c" />
@@ -196,4 +202,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/VisualC/tests/testgles2/testgles2_VS2008.vcproj b/VisualC/tests/testgles2/testgles2_VS2008.vcproj index b70a137152..efe5355b86 100644 --- a/VisualC/tests/testgles2/testgles2_VS2008.vcproj +++ b/VisualC/tests/testgles2/testgles2_VS2008.vcproj @@ -336,6 +336,10 @@ CopyLocalSatelliteAssemblies="false"
RelativePathToProject=".\SDLmain\SDLmain_VS2008.vcproj"
/>
+ <ProjectReference
+ ReferencedProjectIdentifier="{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+ RelativePathToProject=".\SDLtest\SDLtest_VS2008.vcproj"
+ />
</References>
<Files>
<File
|