mirror of
https://github.com/enduro2d/enduro2d.git
synced 2025-12-13 15:48:11 +07:00
add glew submodule
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -13,3 +13,6 @@
|
||||
[submodule "modules/variant"]
|
||||
path = modules/variant
|
||||
url = https://github.com/mpark/variant
|
||||
[submodule "modules/glew"]
|
||||
path = modules/glew
|
||||
url = https://github.com/Perlmint/glew-cmake
|
||||
|
||||
@@ -101,6 +101,10 @@ set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
||||
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||
add_subdirectory(modules/glfw)
|
||||
|
||||
set(glew-cmake_BUILD_SHARED OFF CACHE BOOL "" FORCE)
|
||||
set(glew-cmake_BUILD_MULTI_CONTEXT OFF CACHE BOOL "" FORCE)
|
||||
add_subdirectory(modules/glew)
|
||||
|
||||
#
|
||||
# e2d library target
|
||||
#
|
||||
@@ -132,6 +136,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
set(E2D_LIBRARIES
|
||||
enduro2d
|
||||
glfw
|
||||
libglew_static
|
||||
${OPENGL_gl_LIBRARY}
|
||||
${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
|
||||
@@ -28,6 +28,17 @@ namespace e2d
|
||||
using vertex_buffer_ptr = std::shared_ptr<vertex_buffer>;
|
||||
using render_target_ptr = std::shared_ptr<render_target>;
|
||||
|
||||
//
|
||||
// bad_render_operation
|
||||
//
|
||||
|
||||
class bad_render_operation final : public exception {
|
||||
public:
|
||||
const char* what() const noexcept final {
|
||||
return "bad render operation";
|
||||
}
|
||||
};
|
||||
|
||||
//
|
||||
// pixel_declaration
|
||||
//
|
||||
|
||||
Submodule modules/catch2 updated: e1307016f0...1faccd601d
1
modules/glew
Submodule
1
modules/glew
Submodule
Submodule modules/glew added at 06ec3affe2
Submodule modules/glfw updated: 5afcd0981b...2de2589f91
@@ -25,6 +25,9 @@ cp -fv $MODULES_DIR/catch2/single_include/catch2/catch.hpp $UNTESTS_DIR/catch/ca
|
||||
mkdir -p $SOURCES_RDPARTY_DIR/glfw
|
||||
cp -rfv $MODULES_DIR/glfw/include/GLFW/ $SOURCES_RDPARTY_DIR/glfw/
|
||||
|
||||
mkdir -p $SOURCES_RDPARTY_DIR/glew
|
||||
cp -rfv $MODULES_DIR/glew/include/GL/ $SOURCES_RDPARTY_DIR/glew/
|
||||
|
||||
mkdir -p $SOURCES_RDPARTY_DIR/stb
|
||||
cp -fv $MODULES_DIR/stb/stb_image.h $SOURCES_RDPARTY_DIR/stb/stb_image.h
|
||||
cp -fv $MODULES_DIR/stb/stb_image_resize.h $SOURCES_RDPARTY_DIR/stb/stb_image_resize.h
|
||||
|
||||
2888
sources/3rdparty/glew/eglew.h
vendored
Normal file
2888
sources/3rdparty/glew/eglew.h
vendored
Normal file
File diff suppressed because it is too large
Load Diff
26247
sources/3rdparty/glew/glew.h
vendored
Normal file
26247
sources/3rdparty/glew/glew.h
vendored
Normal file
File diff suppressed because it is too large
Load Diff
1789
sources/3rdparty/glew/glxew.h
vendored
Normal file
1789
sources/3rdparty/glew/glxew.h
vendored
Normal file
File diff suppressed because it is too large
Load Diff
1451
sources/3rdparty/glew/wglew.h
vendored
Normal file
1451
sources/3rdparty/glew/wglew.h
vendored
Normal file
File diff suppressed because it is too large
Load Diff
@@ -439,6 +439,9 @@ namespace e2d
|
||||
|
||||
render::render(debug& debug, window& window)
|
||||
: state_(new internal_state(debug, window)) {
|
||||
if ( glewInit() != GLEW_OK ) {
|
||||
throw bad_render_operation();
|
||||
}
|
||||
opengl::gl_trace_info(debug);
|
||||
opengl::gl_trace_limits(debug);
|
||||
GL_CHECK_CODE(state_->dbg(), glPixelStorei(GL_PACK_ALIGNMENT, 1));
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#if defined(E2D_RENDER_MODE) && E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL
|
||||
|
||||
#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
|
||||
# include <3rdparty/glew/glew.h>
|
||||
# include <OpenGL/gl.h>
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user