kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

implemented runtime opengl functionality checking.

Browse source
This commit is contained in:
rachytski 2011-04-28 19:24:22 +03:00 • committed by Alex Zolotarev
parent 1d26145e3e
commit a15b78f547
11 changed files with 127 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -16,6 +16,8 @@
#include "../std/algorithm.hpp"
#include "../version/version.hpp"
#include "../yg/internal/opengl.hpp"
#include "../base/start_mem_debug.hpp"
@ -263,7 +265,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
m_isBenchmarkInitialized(false),
m_bgColor(0xEE, 0xEE, 0xDD, 0xFF),
m_renderQueue(GetPlatform().SkinName(),
GetPlatform().IsMultiSampled(),
GetPlatform().IsMultiSampled() && yg::gl::g_isMultisamplingSupported,
GetPlatform().DoPeriodicalUpdate(),
GetPlatform().PeriodicalUpdateInterval(),
GetPlatform().IsBenchmarking(),

2
platform/qtplatform.cpp
View file

@ -384,7 +384,7 @@ public:
bool IsBenchmarking() const
{
bool res = true;
bool res = false;
#ifndef OMIM_PRODUCTION
if (res)
{

9
qt/widgets.cpp
View file

@ -31,6 +31,12 @@ namespace qt
#ifdef OMIM_OS_WINDOWS
win32::InitOpenGL();
#endif
if (!yg::gl::CheckExtensionSupport())
{
/// TODO: Show "Please Update Drivers" dialog and close the program.
}
m_renderContext = shared_ptr<yg::gl::RenderContext>(new qt::gl::RenderContext(this));
m_resourceManager = make_shared_ptr(new yg::ResourceManager(
50000 * sizeof(yg::gl::Vertex),
@ -48,7 +54,8 @@ namespace qt
GetPlatform().ReadPathForFile("fonts_whitelist.txt").c_str(),
GetPlatform().ReadPathForFile("fonts_blacklist.txt").c_str(),
2000000,
yg::Rt8Bpp));
yg::Rt8Bpp,
!yg::gl::g_isBufferObjectsSupported));
m_resourceManager->addFonts(GetPlatform().GetFontNames());

13
qt_tstfrm/tstwidgets.cpp
View file

@ -9,9 +9,10 @@
#include "../yg/renderbuffer.hpp"
#include "../yg/resource_manager.hpp"
#ifdef OMIM_OS_WINDOWS
#include "../yg/internal/opengl.hpp"
/*#ifdef OMIM_OS_WINDOWS
#include "../yg/internal/opengl_win32.hpp"
#endif
#endif*/
#include "../platform/platform.hpp"
@ -36,6 +37,11 @@ void GLDrawWidget::initializeGL()
win32::InitOpenGL();
#endif
if (!yg::gl::CheckExtensionSupport())
{
/// TODO: Show "Please Update Drivers" dialog and close the program.
}
m_primaryContext = make_shared_ptr(new qt::gl::RenderContext(this));
m_resourceManager = make_shared_ptr(new yg::ResourceManager(
@ -53,7 +59,8 @@ void GLDrawWidget::initializeGL()
GetPlatform().ReadPathForFile("fonts_whitelist.txt").c_str(),
GetPlatform().ReadPathForFile("fonts_blacklist.txt").c_str(),
2000000,
yg::Rt8Bpp));
yg::Rt8Bpp,
!yg::gl::g_isBufferObjectsSupported));
m_resourceManager->addFonts(GetPlatform().GetFontNames());

13
yg/internal/opengl.cpp
View file

@ -10,8 +10,19 @@
namespace yg
{
namespace ogl
namespace gl
{
bool g_isBufferObjectsSupported = true;
bool g_isFramebufferSupported = true;
bool g_isRenderbufferSupported = true;
bool g_isMultisamplingSupported = true;
bool CheckExtensionSupport()
{
/// this functionality must be supported
return (g_isFramebufferSupported && g_isRenderbufferSupported);
}
void LogError(char const * err, my::SrcPoint const & srcPt)
{
if (err)

16
yg/internal/opengl.hpp
View file

@ -31,17 +31,25 @@
namespace yg
{
namespace ogl
namespace gl
{
extern bool g_isBufferObjectsSupported;
extern bool g_isFramebufferSupported;
extern bool g_isRenderbufferSupported;
extern bool g_isMultisamplingSupported;
/// return false to terminate program
bool CheckExtensionSupport();
void CheckError(my::SrcPoint const & srcPt);
void CheckEGLError(my::SrcPoint const & srcPt);
}
}
#ifdef DEBUG
#define OGLCHECK(f) do {f; yg::ogl::CheckError(SRC());} while(false)
#define OGLCHECKAFTER yg::ogl::CheckError(SRC())
#define EGLCHECK do {yg::ogl::CheckEGLError(SRC());} while(false)
#define OGLCHECK(f) do {f; yg::gl::CheckError(SRC());} while(false)
#define OGLCHECKAFTER yg::gl::CheckError(SRC())
#define EGLCHECK do {yg::gl::CheckEGLError(SRC());} while(false)
#else
#define OGLCHECK(f) f
#define OGLCHECKAFTER

61
yg/internal/opengl_win32.cpp
View file

@ -13,8 +13,8 @@ PFNGLGENBUFFERSPROC glGenBuffers;
PFNGLBUFFERDATAPROC glBufferData;
PFNGLBUFFERSUBDATAPROC glBufferSubData;
PFNGLDELETEBUFFERSPROC glDeleteBuffers;
PFNGLACTIVETEXTUREPROC glActiveTexture;
PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture;
//PFNGLACTIVETEXTUREPROC glActiveTexture;
//PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture;
PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample;
PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
@ -39,7 +39,7 @@ namespace win32
if (p == 0)
{
DWORD const err = ::GetLastError();
LOG(LCRITICAL, ("OpenGL extension function ", name, " not found. Last error = ", err));
LOG(LINFO, ("OpenGL extension function ", name, " not found. Last error = ", err));
}
return reinterpret_cast<TRet>(p);
}
@ -48,27 +48,62 @@ namespace win32
{
HMODULE hInst = 0;
/// buffer objects extensions
glBindBuffer = GetGLProc<PFNGLBINDBUFFERPROC>(hInst, "glBindBuffer");
glGenBuffers = GetGLProc<PFNGLGENBUFFERSPROC>(hInst, "glGenBuffers");
glBufferData = GetGLProc<PFNGLBUFFERDATAPROC>(hInst, "glBufferData");
glBufferSubData = GetGLProc<PFNGLBUFFERSUBDATAPROC>(hInst, "glBufferSubData");
glDeleteBuffers = GetGLProc<PFNGLDELETEBUFFERSPROC>(hInst, "glDeleteBuffers");
glActiveTexture = GetGLProc<PFNGLACTIVETEXTUREPROC>(hInst, "glActiveTexture");
glClientActiveTexture = GetGLProc<PFNGLCLIENTACTIVETEXTUREPROC>(hInst, "glClientActiveTexture");
glMapBuffer = GetGLProc<PFNGLMAPBUFFERPROC>(hInst, "glMapBuffer");
glUnmapBuffer = GetGLProc<PFNGLUNMAPBUFFERPROC>(hInst, "glUnmapBuffer");
yg::gl::g_isBufferObjectsSupported = &glBindBuffer
&& &glGenBuffers
&& &glBufferData
&& &glBufferSubData
&& &glDeleteBuffers
&& &glMapBuffer
&& &glUnmapBuffer;
// glActiveTexture = GetGLProc<PFNGLACTIVETEXTUREPROC>(hInst, "glActiveTexture");
// glClientActiveTexture = GetGLProc<PFNGLCLIENTACTIVETEXTUREPROC>(hInst, "glClientActiveTexture");
/// framebuffers extensions
glBindFramebuffer = GetGLProc<PFNGLBINDFRAMEBUFFERPROC>(hInst, "glBindFramebuffer");
glFramebufferTexture2D = GetGLProc<PFNGLFRAMEBUFFERTEXTURE2DPROC>(hInst, "glFramebufferTexture2D");
glFramebufferRenderbuffer = GetGLProc<PFNGLFRAMEBUFFERRENDERBUFFERPROC>(hInst, "glFramebufferRenderbuffer");
glGenFramebuffers = GetGLProc<PFNGLGENFRAMEBUFFERSPROC>(hInst, "glGenFramebuffers");
glDeleteFramebuffers = GetGLProc<PFNGLDELETEFRAMEBUFFERSPROC>(hInst, "glDeleteFramebuffers");
glBindRenderbufferEXT = GetGLProc<PFNGLBINDRENDERBUFFEREXTPROC>(hInst, "glBindRenderbufferEXT");
glGenRenderbuffers = GetGLProc<PFNGLGENRENDERBUFFERSPROC>(hInst, "glGenRenderbuffers");
glRenderbufferStorageEXT = GetGLProc<PFNGLRENDERBUFFERSTORAGEEXTPROC>(hInst, "glRenderbufferStorageEXT");
glDeleteRenderbuffersEXT = GetGLProc<PFNGLDELETERENDERBUFFERSEXTPROC>(hInst, "glDeleteRenderbuffersEXT");
glMapBuffer = GetGLProc<PFNGLMAPBUFFERPROC>(hInst, "glMapBuffer");
glUnmapBuffer = GetGLProc<PFNGLUNMAPBUFFERPROC>(hInst, "glUnmapBuffer");
glBlitFramebuffer = GetGLProc<PFNGLBLITFRAMEBUFFERPROC>(hInst, "glBlitFramebuffer");
glRenderbufferStorageMultisample = GetGLProc<PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC>(hInst, "glRenderbufferStorageMultisample");
glCheckFramebufferStatusEXT = GetGLProc<PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC>(hInst, "glCheckFramebufferStatusEXT");
glBlitFramebuffer = GetGLProc<PFNGLBLITFRAMEBUFFERPROC>(hInst, "glBlitFramebuffer");
yg::gl::g_isFramebufferSupported = &glBindFrameBuffer
&& &glFramebufferTexture2D
&& &glFramebufferRenderbuffer
&& &glGenFramebuffers
&& &glDeleteFramebuffers
&& &glCheckFramebufferStatusEXT
&& &glBlitFramebuffer;
/// renderbuffer extensions
glGenRenderbuffers = GetGLProc<PFNGLGENRENDERBUFFERSPROC>(hInst, "glGenRenderbuffers");
glDeleteRenderbuffersEXT = GetGLProc<PFNGLDELETERENDERBUFFERSEXTPROC>(hInst, "glDeleteRenderbuffersEXT");
glBindRenderbufferEXT = GetGLProc<PFNGLBINDRENDERBUFFEREXTPROC>(hInst, "glBindRenderbufferEXT");
glRenderbufferStorageEXT = GetGLProc<PFNGLRENDERBUFFERSTORAGEEXTPROC>(hInst, "glRenderbufferStorageEXT");
yg::gl::g_isRenderbufferSupported = &glGenRenderbuffers
&& &glDeleteRenderbuffersEXT
&& &BindRenderbufferEXT
&& &RenderbufferStorageEXT;
/// multisampling extensions
glRenderbufferStorageMultisample = GetGLProc<PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC>(hInst, "glRenderbufferStorageMultisample");
yg::gl::g_isMultisamplingSupported = &glRenderbufferStorageMultisample;
}
}

11
yg/internal/opengl_win32.hpp
View file

@ -30,6 +30,17 @@ extern PFNGLMAPBUFFERPROC glMapBuffer;
extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
namespace yg
{
namespace gl
{
extern bool g_isBufferObjectsSupported;
extern bool g_isFramebufferSupported;
extern bool g_isRenderbufferSupported;
extern bool g_isMultisamplingSupported;
}
}
namespace win32
{
void InitOpenGL();

40
yg/yg_tests/screengl_test.cpp
View file

@ -954,11 +954,11 @@ namespace
}
};
// UNIT_TEST_GL(TestDrawPolyOverflow);
UNIT_TEST_GL(TestDrawPolyOverflow);
UNIT_TEST_GL(TestDrawText);
// UNIT_TEST_GL(TestDrawSingleSymbol);
// UNIT_TEST_GL(TestDrawEmptySymbol);
// UNIT_TEST_GL(TestDrawSingleSymbolAndSolidPath);
UNIT_TEST_GL(TestDrawSingleSymbol);
UNIT_TEST_GL(TestDrawEmptySymbol);
UNIT_TEST_GL(TestDrawSingleSymbolAndSolidPath);
UNIT_TEST_GL(TestDrawString);
UNIT_TEST_GL(TestDrawStringWithFixedFont);
UNIT_TEST_GL(TestDrawStringWithColor);
@ -970,21 +970,21 @@ namespace
UNIT_TEST_GL(TestDrawTextOverflow);
UNIT_TEST_GL(TestDrawTextFiltering);
UNIT_TEST_GL(TestDrawRandomTextFiltering);
// UNIT_TEST_GL(TestDrawSGIConvex);
// UNIT_TEST_GL(TestDrawPoly);
// UNIT_TEST_GL(TestDrawSolidRect);
// UNIT_TEST_GL(TestDrawPathWithSkinPageMiss);
UNIT_TEST_GL(TestDrawSGIConvex);
UNIT_TEST_GL(TestDrawPoly);
UNIT_TEST_GL(TestDrawSolidRect);
UNIT_TEST_GL(TestDrawPathWithSkinPageMiss);
// UNIT_TEST_GL(TestDrawPathWithOffset);
// UNIT_TEST_GL(TestDrawPathJoin);
// UNIT_TEST_GL(TestDrawPathSolid1PX);
// UNIT_TEST_GL(TestDrawPathSolid2PX);
// UNIT_TEST_GL(TestDrawPathSolid);
// UNIT_TEST_GL(TestDrawSector);
// UNIT_TEST_GL(TestDrawPathSolidDiffWidth);
// UNIT_TEST_GL(TestDrawPathSolidWithZ);
// UNIT_TEST_GL(TestDrawPathSolidWithClipRect);
// UNIT_TEST_GL(TestDrawUtilsRect);
// UNIT_TEST_GL(TestDrawUtilsRectFilledTexture);
// UNIT_TEST_GL(TestDrawSymbolFiltering);
// UNIT_TEST_GL(TestDrawCircle);
UNIT_TEST_GL(TestDrawPathJoin);
UNIT_TEST_GL(TestDrawPathSolid1PX);
UNIT_TEST_GL(TestDrawPathSolid2PX);
UNIT_TEST_GL(TestDrawPathSolid);
UNIT_TEST_GL(TestDrawSector);
UNIT_TEST_GL(TestDrawPathSolidDiffWidth);
UNIT_TEST_GL(TestDrawPathSolidWithZ);
UNIT_TEST_GL(TestDrawPathSolidWithClipRect);
UNIT_TEST_GL(TestDrawUtilsRect);
UNIT_TEST_GL(TestDrawUtilsRectFilledTexture);
UNIT_TEST_GL(TestDrawSymbolFiltering);
UNIT_TEST_GL(TestDrawCircle);
}

2
yg/yg_tests/skin_loader_test.cpp
View file

@ -8,6 +8,6 @@
UNIT_TEST(SkinLoaderTest_Main)
{
GL_TEST_START;
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(1000, 1000, 2, 1000, 1000, 2, 1000, 1000, 2, 128, 128, 15, "", "", "", 2000000, yg::Rt8Bpp));
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(1000, 1000, 2, 1000, 1000, 2, 1000, 1000, 2, 128, 128, 15, "", "", "", 2000000, yg::Rt8Bpp, false));
/*yg::Skin * skin = */loadSkin(rm, "basic.skn", 2, 2);
};

2
yg/yg_tests/skin_test.cpp
View file

@ -9,7 +9,7 @@ UNIT_TEST(SkinTest_Main)
{
GL_TEST_START;
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(100, 100, 1, 100, 100, 1, 100, 100, 1, 128, 128, 15, "", "", "", 2000000, yg::Rt8Bpp));
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(100, 100, 1, 100, 100, 1, 100, 100, 1, 128, 128, 15, "", "", "", 2000000, yg::Rt8Bpp, false));
yg::Skin * skin = loadSkin(rm, "test.skn", 2, 2);
double p0 [] = {1, 1};