Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert GLES3 changes for OSMesa in Windows #1079

Merged
merged 1 commit into from
Apr 28, 2023

Conversation

tdcosta100
Copy link
Collaborator

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.dll was changed to libGLESv3.dll, but the latter file doesn't exist. Support for OpenGL ES 3.0 is provided by libGLESv2.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.

Copy link
Collaborator

@acalcutt acalcutt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@acalcutt acalcutt merged commit 4c01b7e into maplibre:main Apr 28, 2023
@tdcosta100 tdcosta100 deleted the revert-windows-osmesa branch April 28, 2023 15:56
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
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants