[Bf-blender-cvs] [6eae5d38f52] epoxy: Cycles: replace GLEW by libepoxy

[Christian Rauch]

Commit: 6eae5d38f5271d663faea644383d45078064a5ee
Author: Christian Rauch
Date:   Sat Jun 25 03:29:57 2022 +0100
Branches: epoxy
https://developer.blender.org/rB6eae5d38f5271d663faea644383d45078064a5ee

Cycles: replace GLEW by libepoxy

===================================================================

M	intern/cycles/app/opengl/display_driver.cpp
M	intern/cycles/app/opengl/shader.cpp
M	intern/cycles/app/opengl/window.cpp
M	intern/cycles/hydra/display_driver.cpp
M	intern/cycles/util/opengl.h

===================================================================

diff --git a/intern/cycles/app/opengl/display_driver.cpp b/intern/cycles/app/opengl/display_driver.cpp
index 8b99f3b6feb..d9c72c07ae4 100644
--- a/intern/cycles/app/opengl/display_driver.cpp
+++ b/intern/cycles/app/opengl/display_driver.cpp
@@ -7,8 +7,8 @@
 #include "util/log.h"
 #include "util/string.h"
 
-#include <GL/glew.h>
 #include <SDL.h>
+#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/app/opengl/shader.cpp b/intern/cycles/app/opengl/shader.cpp
index 9db9ea7fce9..4d22fc2b763 100644
--- a/intern/cycles/app/opengl/shader.cpp
+++ b/intern/cycles/app/opengl/shader.cpp
@@ -6,7 +6,7 @@
 #include "util/log.h"
 #include "util/string.h"
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/app/opengl/window.cpp b/intern/cycles/app/opengl/window.cpp
index 7351ae3eecd..f3352decd08 100644
--- a/intern/cycles/app/opengl/window.cpp
+++ b/intern/cycles/app/opengl/window.cpp
@@ -11,8 +11,8 @@
 #include "util/time.h"
 #include "util/version.h"
 
-#include <GL/glew.h>
 #include <SDL.h>
+#include <epoxy/gl.h>
 
 CCL_NAMESPACE_BEGIN
 
@@ -294,7 +294,6 @@ void window_main_loop(const char *title,
   SDL_RaiseWindow(V.window);
 
   V.gl_context = SDL_GL_CreateContext(V.window);
-  glewInit();
   SDL_GL_MakeCurrent(V.window, nullptr);
 
   window_reshape(width, height);
diff --git a/intern/cycles/hydra/display_driver.cpp b/intern/cycles/hydra/display_driver.cpp
index 0c0b577c358..1a989605335 100644
--- a/intern/cycles/hydra/display_driver.cpp
+++ b/intern/cycles/hydra/display_driver.cpp
@@ -11,7 +11,7 @@
 #include "hydra/render_buffer.h"
 #include "hydra/session.h"
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <pxr/imaging/hgiGL/texture.h>
 
 HDCYCLES_NAMESPACE_OPEN_SCOPE
diff --git a/intern/cycles/util/opengl.h b/intern/cycles/util/opengl.h
index 090deb861c4..fefee4ec022 100644
--- a/intern/cycles/util/opengl.h
+++ b/intern/cycles/util/opengl.h
@@ -7,6 +7,6 @@
 /* OpenGL header includes, used everywhere we use OpenGL, to deal with
  * platform differences in one central place. */
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 
 #endif /* __UTIL_OPENGL_H__ */