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

glad instead glew

Browse Source
This commit is contained in:
BlackMATov
2021-01-18 00:15:08 +07:00
parent 38369604da
commit 132fac13aa
11 changed files with 5307 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -13,9 +13,6 @@
[submodule "modules/rapidjson"]
path = modules/rapidjson
url = https://github.com/Tencent/rapidjson
[submodule "modules/glew"]
path = modules/glew
url = https://github.com/Perlmint/glew-cmake
[submodule "modules/glfw"]
path = modules/glfw
url = https://github.com/glfw/glfw

13
CMakeLists.txt
View File

@@ -125,8 +125,6 @@ add_subdirectory(modules/enum.hpp)
add_subdirectory(modules/flat.hpp)
add_subdirectory(modules/promise.hpp)
# glfw
set(GLFW_INSTALL OFF CACHE INTERNAL "" FORCE)
set(GLFW_BUILD_DOCS OFF CACHE INTERNAL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
@@ -135,14 +133,6 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE)
add_subdirectory(modules/glfw)
set_target_properties(glfw PROPERTIES FOLDER modules)
# glew
set(glew-cmake_BUILD_STATIC ON CACHE INTERNAL "" FORCE)
set(glew-cmake_BUILD_SHARED OFF CACHE INTERNAL "" FORCE)
add_subdirectory(modules/glew)
set_target_properties(libglew_static PROPERTIES FOLDER modules)
#
# e2d library target
#
@@ -166,7 +156,6 @@ target_link_libraries(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PRIVATE glfw
PRIVATE libglew_static
PRIVATE OpenGL::GL
PRIVATE Threads::Threads
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:winmm.lib>)
@@ -178,7 +167,7 @@ target_include_directories(${PROJECT_NAME}
PUBLIC headers/3rdparty/pugixml
PRIVATE sources
PRIVATE sources/3rdparty
PRIVATE sources/3rdparty/glew)
PRIVATE sources/3rdparty/glad)
target_compile_options(${PROJECT_NAME}
PRIVATE

4
headers/enduro2d/core/render.hpp
View File

@@ -890,10 +890,6 @@ namespace e2d
u32 max_vertex_attributes = 0;
u32 max_vertex_texture_image_units = 0;
u32 max_varying_vectors = 0;
u32 max_vertex_uniform_vectors = 0;
u32 max_fragment_uniform_vectors = 0;
bool npot_texture_supported = false;
bool depth_texture_supported = false;
bool render_target_supported = false;

1
modules/glew

Submodule modules/glew deleted from f456deace7

290
sources/3rdparty/glad/KHR/khrplatform.h vendored Normal file
View File

@@ -0,0 +1,290 @@
#ifndef __khrplatform_h_
#define __khrplatform_h_
/*
** Copyright (c) 2008-2018 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
** "Materials"), to deal in the Materials without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Materials, and to
** permit persons to whom the Materials are furnished to do so, subject to
** the following conditions:
**
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Materials.
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
/* Khronos platform-specific types and definitions.
*
* The master copy of khrplatform.h is maintained in the Khronos EGL
* Registry repository at https://github.com/KhronosGroup/EGL-Registry
* The last semantic modification to khrplatform.h was at commit ID:
* 67a3e0864c2d75ea5287b9f3d2eb74a745936692
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos
* group so that they can be included in future versions of this file.
* Please submit changes by filing pull requests or issues on
* the EGL Registry repository linked above.
*
*
* See the Implementer's Guidelines for information about where this file
* should be located on your system and for more details of its use:
* http://www.khronos.org/registry/implementers_guide.pdf
*
* This file should be included as
* #include <KHR/khrplatform.h>
* by Khronos client API header files that use its types and defines.
*
* The types in khrplatform.h should only be used to define API-specific types.
*
* Types defined in khrplatform.h:
* khronos_int8_t signed 8 bit
* khronos_uint8_t unsigned 8 bit
* khronos_int16_t signed 16 bit
* khronos_uint16_t unsigned 16 bit
* khronos_int32_t signed 32 bit
* khronos_uint32_t unsigned 32 bit
* khronos_int64_t signed 64 bit
* khronos_uint64_t unsigned 64 bit
* khronos_intptr_t signed same number of bits as a pointer
* khronos_uintptr_t unsigned same number of bits as a pointer
* khronos_ssize_t signed size
* khronos_usize_t unsigned size
* khronos_float_t signed 32 bit floating point
* khronos_time_ns_t unsigned 64 bit time in nanoseconds
* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
* nanoseconds
* khronos_stime_nanoseconds_t signed time interval in nanoseconds
* khronos_boolean_enum_t enumerated boolean type. This should
* only be used as a base type when a client API's boolean type is
* an enum. Client APIs which use an integer or other type for
* booleans cannot use this as the base type for their boolean.
*
* Tokens defined in khrplatform.h:
*
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
*
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
*
* Calling convention macros defined in this file:
* KHRONOS_APICALL
* KHRONOS_APIENTRY
* KHRONOS_APIATTRIBUTES
*
* These may be used in function prototypes as:
*
* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
* int arg1,
* int arg2) KHRONOS_APIATTRIBUTES;
*/
#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
# define KHRONOS_STATIC 1
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL
*-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype.
*/
#if defined(KHRONOS_STATIC)
/* If the preprocessor constant KHRONOS_STATIC is defined, make the
* header compatible with static linking. */
# define KHRONOS_APICALL
#elif defined(_WIN32)
# define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C
#elif defined(__ANDROID__)
# define KHRONOS_APICALL __attribute__((visibility("default")))
#else
# define KHRONOS_APICALL
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIENTRY
*-------------------------------------------------------------------------
* This follows the return type of the function and precedes the function
* name in the function prototype.
*/
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall
#else
# define KHRONOS_APIENTRY
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIATTRIBUTES
*-------------------------------------------------------------------------
* This follows the closing parenthesis of the function prototype arguments.
*/
#if defined (__ARMCC_2__)
#define KHRONOS_APIATTRIBUTES __softfp
#else
#define KHRONOS_APIATTRIBUTES
#endif
/*-------------------------------------------------------------------------
* basic type definitions
*-----------------------------------------------------------------------*/
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
/*
* Using <stdint.h>
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(__VMS ) || defined(__sgi)
/*
* Using <inttypes.h>
*/
#include <inttypes.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
/*
* Win32
*/
typedef __int32 khronos_int32_t;
typedef unsigned __int32 khronos_uint32_t;
typedef __int64 khronos_int64_t;
typedef unsigned __int64 khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(__sun__) || defined(__digital__)
/*
* Sun or Digital
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#if defined(__arch64__) || defined(_LP64)
typedef long int khronos_int64_t;
typedef unsigned long int khronos_uint64_t;
#else
typedef long long int khronos_int64_t;
typedef unsigned long long int khronos_uint64_t;
#endif /* __arch64__ */
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif 0
/*
* Hypothetical platform with no float or int64 support
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#define KHRONOS_SUPPORT_INT64 0
#define KHRONOS_SUPPORT_FLOAT 0
#else
/*
* Generic fallback
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#endif
/*
* Types that are (so far) the same on all platforms
*/
typedef signed char khronos_int8_t;
typedef unsigned char khronos_uint8_t;
typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t;
/*
* Types that differ between LLP64 and LP64 architectures - in LLP64,
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
* to be the only LLP64 architecture in current use.
*/
#ifdef _WIN64
typedef signed long long int khronos_intptr_t;
typedef unsigned long long int khronos_uintptr_t;
typedef signed long long int khronos_ssize_t;
typedef unsigned long long int khronos_usize_t;
#else
typedef signed long int khronos_intptr_t;
typedef unsigned long int khronos_uintptr_t;
typedef signed long int khronos_ssize_t;
typedef unsigned long int khronos_usize_t;
#endif
#if KHRONOS_SUPPORT_FLOAT
/*
* Float type
*/
typedef float khronos_float_t;
#endif
#if KHRONOS_SUPPORT_INT64
/* Time types
*
* These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals
* may be either signed or unsigned.
*/
typedef khronos_uint64_t khronos_utime_nanoseconds_t;
typedef khronos_int64_t khronos_stime_nanoseconds_t;
#endif
/*
* Dummy value used to pad enum types to 32 bits.
*/
#ifndef KHRONOS_MAX_ENUM
#define KHRONOS_MAX_ENUM 0x7FFFFFFF
#endif
/*
* Enumerated boolean type
*
* Values other than zero should be considered to be true. Therefore
* comparisons should not be made against KHRONOS_TRUE.
*/
typedef enum {
KHRONOS_FALSE = 0,
KHRONOS_TRUE = 1,
KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
} khronos_boolean_enum_t;
#endif /* __khrplatform_h_ */

1819
sources/3rdparty/glad/glad.c vendored Normal file
View File

File diff suppressed because it is too large Load Diff

3192
sources/3rdparty/glad/glad/glad.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

28
sources/enduro2d/core/render_impl/render_opengl_base.cpp
View File

@@ -1319,25 +1319,6 @@ namespace e2d::opengl
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attributes));
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &max_vertex_texture_image_units));
GLint max_varying_vectors = 0;
GLint max_vertex_uniform_vectors = 0;
GLint max_fragment_uniform_vectors = 0;
#if E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGLES
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_VARYING_VECTORS, &max_varying_vectors));
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_VERTEX_UNIFORM_VECTORS, &max_vertex_uniform_vectors));
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, &max_fragment_uniform_vectors));
#elif E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_VARYING_COMPONENTS, &max_varying_vectors));
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, &max_vertex_uniform_vectors));
GL_CHECK_CODE(debug, glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, &max_fragment_uniform_vectors));
max_varying_vectors *= 4;
max_vertex_uniform_vectors *= 4;
max_fragment_uniform_vectors *= 4;
#else
# error unknown render mode
#endif
caps.max_texture_size = math::numeric_cast<u32>(max_texture_size);
caps.max_renderbuffer_size = math::numeric_cast<u32>(max_renderbuffer_size);
caps.max_cube_map_texture_size = math::numeric_cast<u32>(max_cube_map_texture_size);
@@ -1348,10 +1329,6 @@ namespace e2d::opengl
caps.max_vertex_attributes = math::numeric_cast<u32>(max_vertex_attributes);
caps.max_vertex_texture_image_units = math::numeric_cast<u32>(max_vertex_texture_image_units);
caps.max_varying_vectors = math::numeric_cast<u32>(max_varying_vectors);
caps.max_vertex_uniform_vectors = math::numeric_cast<u32>(max_vertex_uniform_vectors);
caps.max_fragment_uniform_vectors = math::numeric_cast<u32>(max_fragment_uniform_vectors);
const gl_version version = gl_get_version(debug);
caps.profile =
@@ -1379,7 +1356,6 @@ namespace e2d::opengl
version >= gl_version::gles_2_0 ||
gl_has_any_extension(debug,
"GL_OES_framebuffer_object",
"GL_EXT_framebuffer_object",
"GL_ARB_framebuffer_object");
caps.element_index_uint =
@@ -1425,9 +1401,7 @@ namespace e2d::opengl
caps.astc_compression_supported =
gl_has_any_extension(debug,
"GL_OES_texture_compression_astc",
"GL_KHR_texture_compression_astc_ldr",
"GL_KHR_texture_compression_astc_hdr");
"GL_OES_texture_compression_astc");
caps.pvrtc_compression_supported =
gl_has_any_extension(debug,

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

@@ -12,7 +12,7 @@
#if E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL || E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGLES
#if E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL
# include <GL/glew.h>
# include <glad/glad.h>
#elif E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGLES
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>

6
sources/enduro2d/core/render_impl/render_opengl_impl.cpp
View File

@@ -286,12 +286,6 @@ namespace e2d
, default_sp_(gl_program_id::current(debug))
, default_fb_(gl_framebuffer_id::current(debug, GL_FRAMEBUFFER))
{
#if E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL
if ( glewInit() != GLEW_OK ) {
throw bad_render_operation();
}
#endif
gl_trace_info(debug_);
gl_trace_limits(debug_);
gl_fill_device_caps(debug_, device_caps_);

3
sources/enduro2d/core/window_impl/window_glfw.cpp
View File

@@ -8,7 +8,9 @@
#if defined(E2D_WINDOW_MODE) && E2D_WINDOW_MODE == E2D_WINDOW_MODE_GLFW
#define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h>
#include <glad/glad.h>
namespace
{
@@ -424,6 +426,7 @@ namespace e2d
if ( w ) {
glfwMakeContextCurrent(w);
glfwSwapInterval(vsync ? 1 : 0);
gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
}
return {w, glfwDestroyWindow};
}