git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 12:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

gl_engine: Fix compile error if only has OpenGL library on MacOS

Browse source 
Since GLES headers and library can not be found on MacOS,
use macros to determin if link with OpenGL library.
This commit is contained in:
RuiwenTang 2024-06-22 15:45:53 +08:00 • committed by Hermet Park
parent 9191c33013
commit b71d9d563a
5 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/Example.h
View file

@ -317,7 +317,19 @@ struct GlWindow : Window
GlWindow(Example* example, uint32_t width, uint32_t height) : Window(tvg::CanvasEngine::Gl, example, width, height)
{
window = SDL_CreateWindow("ThorVG Example (OpenGL)", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
window = SDL_CreateWindow("ThorVG Example (OpenGLES)", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE);
if (window == nullptr) {
// try create OpenGLES context failed, create OpenGL context instead
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
window = SDL_CreateWindow("ThorVG Example (OpenGL)", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE);
}
context = SDL_GL_CreateContext(window);
}

11
src/renderer/gl_engine/meson.build
View file

@ -36,15 +36,26 @@ if not gles_dep.found()
gles_dep = dependency('GLESv2', required: false)
endif
link_opengl = false
if not gles_dep.found()
gles_dep = dependency('GL')
link_opengl = true
endif
if not gles_dep.found()
gles_dep = meson.get_compiler('cpp').find_library('GL')
link_opengl = true
endif
if link_opengl
gl_target_define = '-DTHORVG_GL_TARGET_GL=1'
else
gl_target_define = '-DTHORVG_GL_TARGET_GLES=1'
endif
engine_dep += [declare_dependency(
compile_args : gl_target_define,
dependencies : gles_dep,
include_directories : include_directories('.'),
sources : source_file,

10
src/renderer/gl_engine/tvgGlCommon.h
View file

@ -24,7 +24,15 @@
#define _TVG_GL_COMMON_H_
#include <assert.h>
#include <GLES3/gl3.h>
#if defined (THORVG_GL_TARGET_GLES)
#include <GLES3/gl3.h>
#elif defined (THORVG_GL_TARGET_GL)
#if defined(__APPLE__) || defined(__MACH__)
#include <OpenGL/gl3.h>
#else
#include <GL/gl3.h>
#endif
#endif
#include "tvgCommon.h"
#include "tvgRender.h"

4
src/renderer/gl_engine/tvgGlRenderTask.cpp
View file

@ -193,9 +193,11 @@ void GlComposeTask::run()
mTasks[i]->run();
}
#if defined(THORVG_GL_TARGET_GLES)
// only OpenGLES has tiled base framebuffer and discard function
GLenum attachments[2] = {GL_STENCIL_ATTACHMENT, GL_DEPTH_ATTACHMENT };
GL_CHECK(glInvalidateFramebuffer(GL_FRAMEBUFFER, 2, attachments));
#endif
// reset scissor box
GL_CHECK(glScissor(0, 0, mFbo->getWidth(), mFbo->getHeight()));
onResolve();

5
src/renderer/gl_engine/tvgGlShader.cpp
View file

@ -73,9 +73,12 @@ uint32_t GlShader::complileShader(uint32_t type, char* shaderSrc)
* [2] shader source
*/
const char* shaderPack[3];
// for now only support GLES version
// but in general All Desktop GPU should use OpenGL version ( #version 330 core )
#if defined (THORVG_GL_TARGET_GLES)
shaderPack[0] ="#version 300 es\n";
#elif defined (THORVG_GL_TARGET_GL)
shaderPack[0] ="#version 330 core\n";
#endif
shaderPack[1] = "precision highp float;\n precision mediump int;\n";
shaderPack[2] = shaderSrc;