BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 00:11:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

enable windows opengl render

Browse Source
This commit is contained in:
Matvey Cherevko
2018-10-23 04:46:15 +07:00
parent 4a723fbda7
commit 687992e68f
4 changed files with 10 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -18,10 +18,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif() endif()
endif() endif()
if(MSVC)
add_definitions(/MP)
endif(MSVC)
if(APPLE) if(APPLE)
add_compile_options(-Wno-deprecated-declarations) add_compile_options(-Wno-deprecated-declarations)
endif(APPLE) endif(APPLE)

2
sources/enduro2d/core/render_impl/render.hpp
View File

@@ -21,6 +21,6 @@
# elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
# define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL # define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
# elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS # elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
# define E2D_RENDER_MODE E2D_RENDER_MODE_NONE # define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
# endif # endif
#endif #endif

2
sources/enduro2d/core/render_impl/render_opengl.cpp
View File

@@ -239,7 +239,7 @@ namespace
Args&&... args) Args&&... args)
{ {
with_gl_use_program(debug, ps->state().id(), with_gl_use_program(debug, ps->state().id(),
[&debug, &ps, &pb](auto&& nf, auto&&... nargs) noexcept { [&debug, &ps, &pb](auto&& nf, auto&&... nargs) {
bind_property_block(debug, ps, pb); bind_property_block(debug, ps, pb);
try { try {
stdex::invoke( stdex::invoke(

95
sources/enduro2d/core/render_impl/render_opengl_base.hpp
View File

@@ -10,94 +10,15 @@
#if defined(E2D_RENDER_MODE) && E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL #if defined(E2D_RENDER_MODE) && E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL
#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX #define GLEW_STATIC
# include <3rdparty/glew/glew.h> #include <3rdparty/glew/glew.h>
# include <OpenGL/gl.h>
#endif
// #if defined(E2D_PLATFORM)
// https://www.khronos.org/registry/OpenGL/extensions/ # if E2D_PLATFORM == E2D_PLATFORM_MACOSX
// OES/OES_rgb8_rgba8.txt # include <OpenGL/gl.h>
// # elif E2D_PLATFORM == E2D_PLATFORM_WINDOWS
# include <gl/GL.h>
#ifndef GL_RGB8 # endif
# define GL_RGB8 0x8051
#endif
#ifndef GL_RGBA8
# define GL_RGBA8 0x8058
#endif
//
// https://www.khronos.org/registry/OpenGL/extensions/
// OES/OES_depth_texture.txt
//
#ifndef GL_UNSIGNED_INT
# define GL_UNSIGNED_INT 0x1405
#endif
#ifndef GL_UNSIGNED_SHORT
# define GL_UNSIGNED_SHORT 0x1403
#endif
#ifndef GL_DEPTH_COMPONENT
# define GL_DEPTH_COMPONENT 0x1902
#endif
//
// https://www.khronos.org/registry/OpenGL/extensions/
// OES/OES_packed_depth_stencil.txt
//
#ifndef GL_DEPTH_STENCIL
# define GL_DEPTH_STENCIL 0x84F9
#endif
#ifndef GL_DEPTH24_STENCIL8
# define GL_DEPTH24_STENCIL8 0x88F0
#endif
#ifndef GL_UNSIGNED_INT_24_8
# define GL_UNSIGNED_INT_24_8 0x84FA
#endif
//
// https://www.khronos.org/registry/OpenGL/extensions/
// EXT/EXT_texture_compression_s3tc.txt
//
#ifndef GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
# define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
#endif
#ifndef GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
# define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
#endif
#ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
# define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
#endif
//
// https://www.khronos.org/registry/OpenGL/extensions/
// IMG/IMG_texture_compression_pvrtc.txt
//
#ifndef GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG
# define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
#endif
#ifndef GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG
# define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
#endif
#ifndef GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG
# define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
#endif
#ifndef GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG
# define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
#endif #endif
#define GL_FLUSH_ERRORS(dbg)\ #define GL_FLUSH_ERRORS(dbg)\