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

auto opengl/es shader headers

Browse Source
This commit is contained in:
Matvey Cherevko
2019-07-31 01:51:48 +07:00
parent 747c24177e
commit 7501a6d676
15 changed files with 104 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -912,8 +912,8 @@ namespace e2d
~render() noexcept final;
shader_ptr create_shader(
const str& vertex_source,
const str& fragment_source);
str_view vertex_source,
str_view fragment_source);
shader_ptr create_shader(
const input_stream_uptr& vertex_stream,

2
samples/bin/library/model_shader.frag
View File

@@ -1,5 +1,3 @@
#version 120
uniform sampler2D u_texture;
varying vec2 v_st0;

2
samples/bin/library/model_shader.vert
View File

@@ -1,5 +1,3 @@
#version 120
uniform mat4 u_matrix_m;
uniform mat4 u_matrix_vp;

2
samples/bin/library/sprite_shader.frag
View File

@@ -1,5 +1,3 @@
#version 120
uniform sampler2D u_texture;
varying vec4 v_tint;

2
samples/bin/library/sprite_shader.vert
View File

@@ -1,5 +1,3 @@
#version 120
uniform mat4 u_matrix_vp;
attribute vec3 a_vertex;

4
samples/sources/sample_00/sample_00.cpp
View File

@@ -10,8 +10,6 @@ using namespace e2d;
namespace
{
const char* vs_source_cstr = R"glsl(
#version 120
attribute vec3 a_position;
attribute vec2 a_uv;
attribute vec4 a_color;
@@ -32,8 +30,6 @@ namespace
)glsl";
const char* fs_source_cstr = R"glsl(
#version 120
uniform float u_time;
uniform sampler2D u_texture1;
uniform sampler2D u_texture2;

4
samples/sources/sample_01/sample_01.cpp
View File

@@ -10,8 +10,6 @@ using namespace e2d;
namespace
{
const char* vs_source_cstr = R"glsl(
#version 120
attribute vec3 a_position;
attribute vec2 a_uv;
attribute vec4 a_color;
@@ -30,8 +28,6 @@ namespace
)glsl";
const char* fs_source_cstr = R"glsl(
#version 120
uniform sampler2D u_texture;
varying vec4 v_color;
varying vec2 v_uv;

4
samples/sources/sample_02/sample_02.cpp
View File

@@ -10,8 +10,6 @@ using namespace e2d;
namespace
{
const char* vs_source_cstr = R"glsl(
#version 120
attribute vec3 a_position;
attribute vec2 a_uv;
@@ -27,8 +25,6 @@ namespace
)glsl";
const char* fs_source_cstr = R"glsl(
#version 120
uniform sampler2D u_texture;
varying vec2 v_uv;

4
sources/enduro2d/core/dbgui_impl/dbgui_shaders.cpp
View File

@@ -9,8 +9,6 @@
namespace
{
const char* vs_src_cstr = R"glsl(
#version 120
attribute vec2 a_position;
attribute vec2 a_uv;
attribute vec4 a_color;
@@ -28,8 +26,6 @@ namespace
)glsl";
const char* fs_src_cstr = R"glsl(
#version 120
uniform sampler2D u_texture;
varying vec4 v_color;
varying vec2 v_uv;

4
sources/enduro2d/core/render_impl/render_none.cpp
View File

@@ -173,8 +173,8 @@ namespace e2d
render::~render() noexcept = default;
shader_ptr render::create_shader(
const str& vertex_source,
const str& fragment_source)
str_view vertex_source,
str_view fragment_source)
{
E2D_UNUSED(vertex_source, fragment_source);
return nullptr;

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

@@ -11,6 +11,57 @@
#if defined(E2D_RENDER_MODE)
#if E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGL || E2D_RENDER_MODE == E2D_RENDER_MODE_OPENGLES
namespace
{
using namespace e2d;
const char* vertex_shader_header_cstr(render::api_profile profile) noexcept {
switch ( profile ) {
case e2d::render::api_profile::unknown:
return "";
case e2d::render::api_profile::opengles2:
case e2d::render::api_profile::opengles3:
return R"glsl(
precision highp int;
precision highp float;
)glsl";
case e2d::render::api_profile::opengl_compat:
return R"glsl(
#version 120
#define highp
#define mediump
#define lowp
)glsl";
default:
E2D_ASSERT_MSG(false, "unexpected render API profile");
return "";
}
}
const char* fragment_shader_header_cstr(render::api_profile profile) noexcept {
switch ( profile ) {
case e2d::render::api_profile::unknown:
return "";
case e2d::render::api_profile::opengles2:
case e2d::render::api_profile::opengles3:
return R"glsl(
precision mediump int;
precision mediump float;
)glsl";
case e2d::render::api_profile::opengl_compat:
return R"glsl(
#version 120
#define highp
#define mediump
#define lowp
)glsl";
default:
E2D_ASSERT_MSG(false, "unexpected render API profile");
return "";
}
}
}
namespace
{
using namespace e2d;
@@ -428,25 +479,36 @@ namespace e2d
render::~render() noexcept = default;
shader_ptr render::create_shader(
const str& vertex_source,
const str& fragment_source)
str_view vertex_source,
str_view fragment_source)
{
E2D_ASSERT(is_in_main_thread());
gl_shader_id vs = gl_compile_shader(
state_->dbg(), vertex_source, GL_VERTEX_SHADER);
state_->dbg(),
vertex_shader_header_cstr(device_capabilities().profile),
vertex_source,
GL_VERTEX_SHADER);
if ( vs.empty() ) {
return nullptr;
}
gl_shader_id fs = gl_compile_shader(
state_->dbg(), fragment_source, GL_FRAGMENT_SHADER);
state_->dbg(),
fragment_shader_header_cstr(device_capabilities().profile),
fragment_source,
GL_FRAGMENT_SHADER);
if ( fs.empty() ) {
return nullptr;
}
gl_program_id ps = gl_link_program(
state_->dbg(), std::move(vs), std::move(fs));
state_->dbg(),
std::move(vs),
std::move(fs));
if ( ps.empty() ) {
return nullptr;
}

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

@@ -1441,14 +1441,32 @@ namespace e2d::opengl
"GL_IMG_texture_compression_pvrtc2");
}
gl_shader_id gl_compile_shader(debug& debug, const str& source, GLenum type) noexcept {
gl_shader_id gl_compile_shader(
debug& debug,
str_view header,
str_view source,
GLenum type) noexcept
{
gl_shader_id id = gl_shader_id::create(debug, type);
if ( id.empty() ) {
return id;
}
const char* source_cstr = source.c_str();
GL_CHECK_CODE(debug, glShaderSource(*id, 1, &source_cstr, nullptr));
const GLchar* sources[] = {
header.empty() ? "" : header.data(),
source.empty() ? "" : source.data()};
const GLint source_lengths[] = {
math::numeric_cast<GLint>(header.size()),
math::numeric_cast<GLint>(source.size())};
static_assert(std::size(sources) == std::size(source_lengths));
GL_CHECK_CODE(debug, glShaderSource(
*id,
math::numeric_cast<GLsizei>(std::size(sources)),
sources,
source_lengths));
GL_CHECK_CODE(debug, glCompileShader(*id));
return process_shader_compilation_result(debug, *id)
? std::move(id)
: gl_shader_id(debug);
@@ -1460,9 +1478,11 @@ namespace e2d::opengl
if ( id.empty() ) {
return id;
}
GL_CHECK_CODE(debug, glAttachShader(*id, *vs));
GL_CHECK_CODE(debug, glAttachShader(*id, *fs));
GL_CHECK_CODE(debug, glLinkProgram(*id));
return process_program_linking_result(debug, *id)
&& process_program_validation_result(debug, *id)
? std::move(id)

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

@@ -299,8 +299,16 @@ namespace e2d::opengl
void gl_trace_limits(debug& debug) noexcept;
void gl_fill_device_caps(debug& debug, render::device_caps& caps) noexcept;
gl_shader_id gl_compile_shader(debug& debug, const str& source, GLenum type) noexcept;
gl_program_id gl_link_program(debug& debug, gl_shader_id vs, gl_shader_id fs) noexcept;
gl_shader_id gl_compile_shader(
debug& debug,
str_view header,
str_view source,
GLenum type) noexcept;
gl_program_id gl_link_program(
debug& debug,
gl_shader_id vs,
gl_shader_id fs) noexcept;
bool gl_check_framebuffer(
debug& debug,

2
untests/bin/library/shader.frag
View File

@@ -1,5 +1,3 @@
#version 120
uniform sampler2D u_texture;
varying vec2 v_st;

2
untests/bin/library/shader.vert
View File

@@ -1,5 +1,3 @@
#version 120
attribute vec3 a_position;
attribute vec2 a_st;