Revert GLES3 changes for OSMesa in Windows #1079
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
acalcutt
force-pushed
the
revert-windows-osmesa
branch
from
0363ca7
to
8edca4c
Compare
acalcutt
approved these changes
Apr 27, 2023
There was a problem hiding this comment.
From the information at https://github.com/pal1000/mesa-dist-win/blob/master/readme.md#opengl-es-drivers-and-egl-library it does seem to confirm this.
There is no libGLESv3.dll and between libGLESv1_CM.dll and libGLESv2.dll there is support for OpenGL ES 1.x, 2.x and 3.x
mwilsnd
approved these changes
Apr 28, 2023
acalcutt
force-pushed
the
revert-windows-osmesa
branch
from
8edca4c
to
cb48e17
Compare
TimSylvester
added a commit
that referenced
this pull request
May 2, 2023
* commit '958cdb82067cc16c2e7a6746b24221240d3e7927': [pre-commit.ci] pre-commit autoupdate (#1096) Add clang-format (#1086) Update paths from maplibre-gl-native to maplibre-native (#1090) Revert GLES3 changes for OSMesa in Windows (#1079) [cmake] Use MLN prefix instead of MBGL (#1054) Create security policy (#1080) Adjust trivial links to maplibre-native (#1083) # Conflicts: # include/mbgl/gfx/shader.hpp # src/mbgl/gfx/vertex_buffer.hpp # src/mbgl/gl/context.cpp # src/mbgl/gl/vertex_array.hpp # src/mbgl/renderer/layers/render_background_layer.cpp # src/mbgl/renderer/render_orchestrator.cpp # src/mbgl/renderer/render_orchestrator.hpp
etnav
reviewed
May 3, 2023
TimSylvester
added a commit
that referenced
this pull request
May 3, 2023
* topic/drawable: (21 commits) build issues [pre-commit.ci] auto fixes from pre-commit.com hooks order drawables [pre-commit.ci] auto fixes from pre-commit.com hooks refactor [pre-commit.ci] pre-commit autoupdate (#1096) Add clang-format (#1086) Move generic shader lookup to context virtual Update paths from maplibre-gl-native to maplibre-native (#1090) missing includes warnings warnings warnings Eliminate GL drawable/builder dependencies from generic background layer Missing include Evaluate and apply color Revert GLES3 changes for OSMesa in Windows (#1079) [cmake] Use MLN prefix instead of MBGL (#1054) warnings Create security policy (#1080) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR #995 bring us the long awaited support for OpenGL ES 3.0. But for OSMesa, which does have support for OpenGL ES 3.0, a reference to the file
libGLESv2.dllwas changed tolibGLESv3.dll, but the latter file doesn't exist. Support for OpenGL ES 3.0 is provided bylibGLESv2.dll, so I'm reverting these changes for the reference to this file. The other changes are good and work well, so I kept all of them.