Runtime openGL loading #40

Hazardu · 2020-05-26T18:22:23Z

No description provided.

…lichtBAW into runtimeOpenGLLoading

source/Irrlicht/COpenGLFunctionTable.h

source/Irrlicht/COpenGLFunctionTable.cpp

source/Irrlicht/COpenGLFunctionTable.h

source/Irrlicht/COpenGLFunctionTable.cpp

AnastaZIuk · 2020-05-27T14:53:34Z

You should use the macros probably and as far as I remember split some functions into classes creating them by macro as well. Look at glue directive

devshgraphicsprogramming · 2020-05-27T17:29:44Z

You should use the macros probably and as far as I remember split some functions into classes creating them by macro as well. Look at glue directive

As you may recall from our chat @Hazardu I gave examples of how its done in CCudaHandler and COpenCLHandler

src/irr/video/COpenGLFunctionTable.h

…finish this asap

I Couldnt find defintions for the following fuctions online: GlFramebufferDrawBuffersEXT GlFramebufferDrawBufferEXT GlFramebufferReadBufferEXT GlGetNamedBufferSubDataEXT The pace of writing those functions is quite slow, as im checking what each of them does There also have been some on the wiki in related articles that i have added, for ex: glGet functions had a few more types on the wiki page

src/irr/video/COpenGLFunctionTable.h

todo: move the ptrs used in those classes to a private class

…ler in COpenGLDRiver, partly in other files Theres a few errors in CopenGLDriver.cpp first being at line 233, Function Table is not a nonstatic data member or base class of class next, 1072, initExtensions() no longer exist, so i assume i need to rewrite it, and put it inside COpenGLFunctionTable.h 3rd issue is RUNNING_IN_RENDERDOC_EXTENSION_NAME at line 1181 is undefined lastly deltype at 2395 with `&COpenGLFunctionTable::glGeneral.pglDisablei`

Hazardu · 2020-07-07T15:27:55Z

in ExtensionHandler, there is a method initExtensions thats being invoked from COpenGLDriver.genericDriverInit. Should i rewrite it and put it inside FunctionTable or OpenGLDriver?

devshgraphicsprogramming · 2020-07-08T17:45:21Z

include/COpenGLStateManagerImpl.h

 #define glBindBufferRange_MACRO glBindBufferRange
 #endif // glBindBufferRange_MACRO

-#ifndef glGetNamedBufferParameteri64v_MACRO
-#define glGetNamedBufferParameteri64v_MACRO glGetNamedBufferParameteri64v
+#ifndef glGetNamedBufferParameteri64v_MACRO
+#define glGetNamedBufferParameteri64v_MACRO glGetNamedBufferParameteri64v
 #endif


all these we don't need, actually I don't think we need the COpenGLStateManagerImpl and the COpenGLStateManager at all

devshgraphicsprogramming · 2020-07-08T17:47:38Z

source/Irrlicht/COpenGLFrameBuffer.cpp

@@ -180,7 +180,7 @@ bool COpenGLFrameBuffer::attach(E_FBO_ATTACHMENT_POINT attachmenPoint, core::sma
    }
    if (enabledBufferCnt)
        enabledBufferCnt += 1-EFAP_COLOR_ATTACHMENT0;
-    COpenGLExtensionHandler::extGlNamedFramebufferDrawBuffers(frameBuffer, enabledBufferCnt, drawBuffers);
+    COpenGLFunctionTable::extGlNamedFramebufferDrawBuffers(frameBuffer, enabledBufferCnt, drawBuffers);


nope the methods of the function table cannot be static, you need getThreadContext_helper then get the function table from the SAuxContext and then call the non-static method

confer with https://github.com/buildaworldnet/IrrlichtBAW/blob/6b7aeccf2d8030799992b651fcd5546d10f79e48/source/Irrlicht/COpenGLDriver.h#L586

devshgraphicsprogramming · 2020-07-08T17:49:22Z

source/Irrlicht/COpenGLExtensionHandler.cpp

+//}
+//}
+//
+//#endif


just remove the file from the repo, we have a file history after all

devshgraphicsprogramming · 2020-07-08T17:50:37Z

src/irr/video/IOpenGLPipeline.h

@@ -38,7 +38,7 @@ class IOpenGLPipeline
            //shader programs can be shared so all names can be freed by any thread
            for (const auto& p : (*m_GLprograms))
                if (p.GLname != 0u)
-                    COpenGLExtensionHandler::extGlDeleteProgram(p.GLname);
+                    COpenGLFunctionTable::extGlDeleteProgram(p.GLname);


no static methods

devshgraphicsprogramming · 2020-07-08T17:50:41Z

src/irr/video/IOpenGLPipeline.h

@@ -54,7 +54,7 @@ class IOpenGLPipeline

            IRR_ASSUME_ALIGNED(_pcData, 128);

-            using gl = COpenGLExtensionHandler;
+            using gl = COpenGLFunctionTable;


no static methods

devshgraphicsprogramming · 2020-07-08T17:51:02Z

src/irr/video/COpenGLSpecializedShader.cpp

+	GLuint GLname = COpenGLFunctionTable::extGlCreateShaderProgramv(m_GLstage, 1u, &glslCode_cstr);

 	GLchar logbuf[1u<<12]; //4k
-	COpenGLExtensionHandler::extGlGetProgramInfoLog(GLname, sizeof(logbuf), nullptr, logbuf);
+	COpenGLFunctionTable::extGlGetProgramInfoLog(GLname, sizeof(logbuf), nullptr, logbuf);


no static methods

devshgraphicsprogramming · 2020-07-08T17:51:07Z

src/irr/video/COpenGLSpecializedShader.cpp

-	COpenGLExtensionHandler::extGlGetProgramiv(GLname, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
+	COpenGLFunctionTable::extGlGetProgramiv(GLname, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
 	binary.binary = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<uint8_t>>(binaryLength);
-	COpenGLExtensionHandler::extGlGetProgramBinary(GLname, binaryLength, nullptr, &binary.format, binary.binary->data());
+	COpenGLFunctionTable::extGlGetProgramBinary(GLname, binaryLength, nullptr, &binary.format, binary.binary->data());


no static methods

devshgraphicsprogramming · 2020-07-08T17:51:11Z

src/irr/video/COpenGLSpecializedShader.cpp

@@ -196,7 +196,7 @@ void COpenGLSpecializedShader::gatherUniformLocations(GLuint _GLname) const
 {
 	m_locations.resize(m_uniformsList.size());
 	for (size_t i = 0ull; i < m_uniformsList.size(); ++i)
-		m_locations[i] = COpenGLExtensionHandler::extGlGetUniformLocation(_GLname, m_uniformsList[i].m.name.c_str());
+		m_locations[i] = COpenGLFunctionTable::extGlGetUniformLocation(_GLname, m_uniformsList[i].m.name.c_str());


no static methods

devshgraphicsprogramming · 2020-07-08T17:57:37Z

src/irr/video/COpenGLImageView.h

-			COpenGLExtensionHandler::extGlTextureParameterIuiv(name,target,GL_TEXTURE_SWIZZLE_RGBA,swizzle);
+			COpenGLFunctionTable::extGlTextureParameterIuiv(name,target,GL_TEXTURE_SWIZZLE_RGBA,swizzle);
 		}

 		void regenerateMipMapLevels() override
 		{
 			if (params.subresourceRange.levelCount <= 1u)
 				return;

-			COpenGLExtensionHandler::extGlGenerateTextureMipmap(name,target);
+			COpenGLFunctionTable::extGlGenerateTextureMipmap(name,target);


no static methods

devshgraphicsprogramming · 2020-07-08T17:58:20Z

src/irr/video/COpenGLImage.h

@@ -37,27 +37,27 @@ class COpenGLImage final : public IGPUImage, public IDriverMemoryAllocation
 			internalFormat(GL_INVALID_ENUM), target(GL_INVALID_ENUM), name(0u)
 		{
 			#ifdef OPENGL_LEAK_DEBUG
-				COpenGLExtensionHandler::textureLeaker.registerObj(this);
+				COpenGLFunctionTable::textureLeaker.registerObj(this);


you can get rid of the textureLeaker we will replace it with something better in the future

devshgraphicsprogramming · 2020-07-08T17:58:36Z

src/irr/video/COpenGLBufferView.h

-			COpenGLExtensionHandler::extGlCreateTextures(GL_TEXTURE_BUFFER, 1, &m_textureName);
+			COpenGLFunctionTable::extGlCreateTextures(GL_TEXTURE_BUFFER, 1, &m_textureName);
 			m_GLformat = getSizedOpenGLFormatFromOurFormat(m_format);

 			if (m_offset==0u && m_size==m_buffer->getSize())
-				COpenGLExtensionHandler::extGlTextureBuffer(m_textureName, m_GLformat, static_cast<COpenGLBuffer*>(m_buffer.get())->getOpenGLName());
+				COpenGLFunctionTable::extGlTextureBuffer(m_textureName, m_GLformat, static_cast<COpenGLBuffer*>(m_buffer.get())->getOpenGLName());
 			else
-				COpenGLExtensionHandler::extGlTextureBufferRange(m_textureName, m_GLformat, static_cast<COpenGLBuffer*>(m_buffer.get())->getOpenGLName(), m_offset, m_size);
+				COpenGLFunctionTable::extGlTextureBufferRange(m_textureName, m_GLformat, static_cast<COpenGLBuffer*>(m_buffer.get())->getOpenGLName(), m_offset, m_size);


no static methods

devshgraphicsprogramming · 2020-07-08T18:01:08Z

source/Irrlicht/COpenGLDriver.cpp

 	glViewport(0, 0, Params.WindowSize.Width, Params.WindowSize.Height);

 	// adjust flat coloring scheme to DirectX version
-	///extGlProvokingVertex(GL_FIRST_VERTEX_CONVENTION_EXT);
+	///COpenGLFunctionTable::glShader.pglProvokingVertex(GL_FIRST_VERTEX_CONVENTION_EXT);

 	// We need to reset once more at the beginning of the first rendering.
 	// This fixes problems with intermediate changes to the material during texture load.
    SAuxContext* found = getThreadContext_helper(false);
-	extGlClipControl(GL_UPPER_LEFT, GL_ZERO_TO_ONE); //once set and should never change (engine doesnt track it)
+    COpenGLFunctionTable::glGeneral.pglClipControl(GL_UPPER_LEFT, GL_ZERO_TO_ONE); //once set and should never change (engine doesnt track it)
    glEnable(GL_FRAMEBUFFER_SRGB);//once set and should never change (engine doesnt track it)
    glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);//once set and should never change (engine doesnt track it)
    glDepthRange(1.0, 0.0);//once set and should never change (engine doesnt track it)


all this setup should probably move to context intialization, don't worry about it now we'll tackle it in a separate PR

devshgraphicsprogramming · 2020-07-08T18:17:49Z

source/Irrlicht/COpenGLDriver.cpp

@@ -3282,9 +3302,118 @@ void COpenGLDriver::enableClipPlane(uint32_t index, bool enable)
 		glDisable(GL_CLIP_DISTANCE0 + index);
 }

+void COpenGLDriver::initExtensions(bool stencilBuffer)
+{
+    core::stringc vendorString = (char*)glGetString(GL_VENDOR);


you need to initExtensions after you init the function table for the main context

because glGetString needs to be called from the pointer in the function table

devshgraphicsprogramming · 2020-07-08T18:18:12Z

source/Irrlicht/COpenGLDriver.cpp

+	glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &reqUBOAlignment);
+    assert(core::is_alignment(reqUBOAlignment));
+	glGetIntegerv(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT, &reqSSBOAlignment);
+    assert(core::is_alignment(reqSSBOAlignment));
+	glGetIntegerv(GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT, &reqTBOAlignment);


glGetIntegerv needs to be called from the pointer in the function table

devshgraphicsprogramming · 2020-07-08T18:18:43Z

source/Irrlicht/COpenGLDriver.cpp

+    glGetIntegerv(GL_MAX_COMBINED_UNIFORM_BLOCKS, reinterpret_cast<GLint*>(&maxUBOBindings));
+    glGetIntegerv(GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS, reinterpret_cast<GLint*>(&maxSSBOBindings));
+    glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, reinterpret_cast<GLint*>(&maxTextureBindings));
+    glGetIntegerv(GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS, reinterpret_cast<GLint*>(&maxTextureBindingsCompute));
+    glGetIntegerv(GL_MAX_COMBINED_IMAGE_UNIFORMS, reinterpret_cast<GLint*>(&maxImageBindings));
+
+	glGetIntegerv(GL_MIN_MAP_BUFFER_ALIGNMENT, &minMemoryMapAlignment);


glGetIntegerv needs to be called from the pointer in the function table

devshgraphicsprogramming · 2020-07-08T18:19:23Z

source/Irrlicht/COpenGLDriver.cpp

+	glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &num);
+	MaxArrayTextureLayers = num;
+
+	if (FeatureAvailable[IRR_EXT_texture_filter_anisotropic])
+	{
+		glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &num);
+		MaxAnisotropy = static_cast<uint8_t>(num);
+	}
+
+
+    if (FeatureAvailable[IRR_ARB_geometry_shader4])
+    {
+        glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES, &num);
+        MaxGeometryVerticesOut = static_cast<uint32_t>(num);
+    }
+
+	if (FeatureAvailable[IRR_EXT_texture_lod_bias])
+		glGetFloatv(GL_MAX_TEXTURE_LOD_BIAS_EXT, &MaxTextureLODBias);
+
+
+	glGetIntegerv(GL_MAX_CLIP_DISTANCES, &num);
+	MaxUserClipPlanes=static_cast<uint8_t>(num);
+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &num);
+    MaxMultipleRenderTargets = static_cast<uint8_t>(num);
+
+	glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, DimAliasedLine);
+	glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, DimAliasedPoint);
+	glGetFloatv(GL_SMOOTH_LINE_WIDTH_RANGE, DimSmoothedLine);
+	glGetFloatv(GL_SMOOTH_POINT_SIZE_RANGE, DimSmoothedPoint);
+
+    const GLubyte* shaderVersion = glGetString(GL_SHADING_LANGUAGE_VERSION);
+    float sl_ver;
+    sscanf(reinterpret_cast<const char*>(shaderVersion),"%f",&sl_ver);
+    ShaderLanguageVersion = static_cast<uint16_t>(core::round(sl_ver*100.0f));
+
+
+	//! For EXT-DSA testing
+	if (IsIntelGPU)
+	{
+		Version = 440;
+		FeatureAvailable[IRR_ARB_direct_state_access] = false;
+	}
+    num=0;
+    glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &num);


glGetIntegerv needs to be called from the pointer in the function table

devshgraphicsprogramming · 2020-07-08T18:19:36Z

source/Irrlicht/COpenGLDriver.cpp

+		glGetIntegerv(0x9047, &val);
+		os::Printer::log("Dedicated video memory (kB)", std::to_string(val));
+		glGetIntegerv(0x9048, &val);
+		os::Printer::log("Total video memory (kB)", std::to_string(val));
+		glGetIntegerv(0x9049, &val);
+		os::Printer::log("Available video memory (kB)", std::to_string(val));
+	}
+	if (FeatureAvailable[IRR_ATI_meminfo])
+	{
+		GLint val[4];
+		glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, val);
+		os::Printer::log("Free texture memory (kB)", std::to_string(val[0]));
+		glGetIntegerv(GL_VBO_FREE_MEMORY_ATI, val);
+		os::Printer::log("Free VBO memory (kB)", std::to_string(val[0]));
+		glGetIntegerv(GL_RENDERBUFFER_FREE_MEMORY_ATI, val);


glGetIntegerv needs to be called from the pointer in the function table

devshgraphicsprogramming · 2020-07-08T18:28:49Z

source/Irrlicht/COpenGLExtensionHandler.h

+//		}
+//
+//		inline void COpenGLExtensionHandler::extGlGetTextureImage(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSizeHint, void* pixels)
+//		


just remove the file

source/Irrlicht/COpenGLDriver.h

…ing context ptr in COpenGLDriver.h line 475

devshgraphicsprogramming · 2020-07-15T18:29:26Z

source/Irrlicht/COpenGLDriver.cpp

@@ -635,7 +635,7 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
 #endif // _IRR_COMPILE_WITH_OPENCL_
 	genericDriverInit(device->getAssetManager());

-	COpenGLFunctionTable::extGlSwapInterval(Params.Vsync ? 1 : 0);
+    getThreadContext_helper(true)->functionTable.extGlSwapInterval(Params.Vsync ? 1 : 0);


did you already lock the context mutex? because thats the only time you should call that function with true

devshgraphicsprogramming · 2020-07-15T18:32:31Z

source/Irrlicht/COpenGLDriver.h

+					//this is troublesome, how to obtain context reference here?
+					//functionTable.glGeneral.pglGetInternalformativ(GL_TEXTURE_2D, getSizedOpenGLFormatFromOurFormat(_fmt), GL_COLOR_RENDERABLE, sizeof(res), &res);


its not a static function, so it should be fine, the only problem is the const.... @Crisspl any advice?

Maybe we could make the operator() on the function pointer wrapper class a const operator?

Hazardu added 5 commits May 26, 2020 11:41

created files

3839e03

Prepared classes

c5e8d26

created files

733d7e0

Prepared classes

e67ea4e

Merge branch 'runtimeOpenGLLoading' of https://github.com/Hazardu/Irr…

8fc11bb

…lichtBAW into runtimeOpenGLLoading

AnastaZIuk reviewed May 27, 2020

View reviewed changes

source/Irrlicht/COpenGLFunctionTable.h Outdated Show resolved Hide resolved

devshgraphicsprogramming reviewed May 27, 2020

View reviewed changes

source/Irrlicht/COpenGLFunctionTable.cpp Outdated Show resolved Hide resolved

devshgraphicsprogramming reviewed May 27, 2020

View reviewed changes

source/Irrlicht/COpenGLFunctionTable.h Outdated Show resolved Hide resolved

devshgraphicsprogramming reviewed May 27, 2020

View reviewed changes

source/Irrlicht/COpenGLFunctionTable.cpp Outdated Show resolved Hide resolved

Hazardu added 2 commits June 4, 2020 13:23

Update COpenGLFunctionTable.h

463ef81

separation into classes

38b34b3

devshgraphicsprogramming reviewed Jun 5, 2020

View reviewed changes