mirror of
https://github.com/luanti-org/luanti.git
synced 2025-07-27 17:28:41 +00:00
Add support for glObjectLabel to aid debugging
This commit is contained in:
parent
d2004d32f6
commit
9554e3d43a
9 changed files with 56 additions and 12 deletions
|
@ -164,13 +164,6 @@ COpenGL3DriverBase::COpenGL3DriverBase(const SIrrlichtCreationParameters ¶ms
|
|||
ExposedData = ContextManager->getContext();
|
||||
ContextManager->activateContext(ExposedData, false);
|
||||
GL.LoadAllProcedures(ContextManager);
|
||||
if (EnableErrorTest && GL.IsExtensionPresent("GL_KHR_debug")) {
|
||||
GL.Enable(GL_DEBUG_OUTPUT);
|
||||
GL.DebugMessageCallback(debugCb, this);
|
||||
} else if (EnableErrorTest) {
|
||||
os::Printer::log("GL debug extension not available");
|
||||
}
|
||||
initQuadsIndices();
|
||||
|
||||
TEST_GL_ERROR(this);
|
||||
}
|
||||
|
@ -248,6 +241,20 @@ bool COpenGL3DriverBase::genericDriverInit(const core::dimension2d<u32> &screenS
|
|||
initFeatures();
|
||||
printTextureFormats();
|
||||
|
||||
if (EnableErrorTest) {
|
||||
if (KHRDebugSupported) {
|
||||
GL.Enable(GL_DEBUG_OUTPUT);
|
||||
GL.DebugMessageCallback(debugCb, this);
|
||||
} else {
|
||||
os::Printer::log("GL debug extension not available");
|
||||
}
|
||||
} else {
|
||||
// don't do debug things if they are not wanted (even if supported)
|
||||
KHRDebugSupported = false;
|
||||
}
|
||||
|
||||
initQuadsIndices();
|
||||
|
||||
// reset cache handler
|
||||
delete CacheHandler;
|
||||
CacheHandler = new COpenGL3CacheHandler(this);
|
||||
|
@ -1615,7 +1622,7 @@ s32 COpenGL3DriverBase::addHighLevelShaderMaterial(
|
|||
s32 nr = -1;
|
||||
COpenGL3MaterialRenderer *r = new COpenGL3MaterialRenderer(
|
||||
this, nr, vertexShaderProgram,
|
||||
pixelShaderProgram,
|
||||
pixelShaderProgram, shaderName,
|
||||
callback, baseMaterial, userData);
|
||||
|
||||
r->drop();
|
||||
|
|
|
@ -161,10 +161,23 @@ public:
|
|||
GL.BlendEquation(mode);
|
||||
}
|
||||
|
||||
inline void irrGlObjectLabel(GLenum identifier, GLuint name, const char *label)
|
||||
{
|
||||
if (KHRDebugSupported) {
|
||||
u32 len = strlen(label);
|
||||
// Since our texture strings can get quite long we also truncate
|
||||
// to a hardcoded limit of 82
|
||||
len = std::min(len, std::min(MaxLabelLength, 82U));
|
||||
GL.ObjectLabel(identifier, name, len, label);
|
||||
}
|
||||
}
|
||||
|
||||
bool LODBiasSupported = false;
|
||||
bool AnisotropicFilterSupported = false;
|
||||
bool BlendMinMaxSupported = false;
|
||||
bool TextureMultisampleSupported = false;
|
||||
bool KHRDebugSupported = false;
|
||||
u32 MaxLabelLength = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ COpenGL3MaterialRenderer::COpenGL3MaterialRenderer(COpenGL3DriverBase *driver,
|
|||
s32 &outMaterialTypeNr,
|
||||
const c8 *vertexShaderProgram,
|
||||
const c8 *pixelShaderProgram,
|
||||
const c8 *debugName,
|
||||
IShaderConstantSetCallBack *callback,
|
||||
E_MATERIAL_TYPE baseMaterial,
|
||||
s32 userData) :
|
||||
|
@ -45,7 +46,7 @@ COpenGL3MaterialRenderer::COpenGL3MaterialRenderer(COpenGL3DriverBase *driver,
|
|||
if (CallBack)
|
||||
CallBack->grab();
|
||||
|
||||
init(outMaterialTypeNr, vertexShaderProgram, pixelShaderProgram);
|
||||
init(outMaterialTypeNr, vertexShaderProgram, pixelShaderProgram, debugName);
|
||||
}
|
||||
|
||||
COpenGL3MaterialRenderer::COpenGL3MaterialRenderer(COpenGL3DriverBase *driver,
|
||||
|
@ -98,6 +99,7 @@ GLuint COpenGL3MaterialRenderer::getProgram() const
|
|||
void COpenGL3MaterialRenderer::init(s32 &outMaterialTypeNr,
|
||||
const c8 *vertexShaderProgram,
|
||||
const c8 *pixelShaderProgram,
|
||||
const c8 *debugName,
|
||||
bool addMaterial)
|
||||
{
|
||||
outMaterialTypeNr = -1;
|
||||
|
@ -121,6 +123,9 @@ void COpenGL3MaterialRenderer::init(s32 &outMaterialTypeNr,
|
|||
if (!linkProgram())
|
||||
return;
|
||||
|
||||
if (debugName)
|
||||
Driver->irrGlObjectLabel(GL_PROGRAM, Program, debugName);
|
||||
|
||||
if (addMaterial)
|
||||
outMaterialTypeNr = Driver->addMaterialRenderer(this);
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@ public:
|
|||
s32 &outMaterialTypeNr,
|
||||
const c8 *vertexShaderProgram = 0,
|
||||
const c8 *pixelShaderProgram = 0,
|
||||
const c8 *debugName = nullptr,
|
||||
IShaderConstantSetCallBack *callback = 0,
|
||||
E_MATERIAL_TYPE baseMaterial = EMT_SOLID,
|
||||
s32 userData = 0);
|
||||
|
@ -66,7 +67,9 @@ protected:
|
|||
E_MATERIAL_TYPE baseMaterial = EMT_SOLID,
|
||||
s32 userData = 0);
|
||||
|
||||
void init(s32 &outMaterialTypeNr, const c8 *vertexShaderProgram, const c8 *pixelShaderProgram, bool addMaterial = true);
|
||||
void init(s32 &outMaterialTypeNr, const c8 *vertexShaderProgram,
|
||||
const c8 *pixelShaderProgram, const c8 *debugName = nullptr,
|
||||
bool addMaterial = true);
|
||||
|
||||
bool createShader(GLenum shaderType, const char *shader);
|
||||
bool linkProgram();
|
||||
|
|
|
@ -23,8 +23,8 @@ COpenGL3Renderer2D::COpenGL3Renderer2D(const c8 *vertexShaderProgram, const c8 *
|
|||
WithTexture(withTexture)
|
||||
{
|
||||
int Temp = 0;
|
||||
|
||||
init(Temp, vertexShaderProgram, pixelShaderProgram, false);
|
||||
init(Temp, vertexShaderProgram, pixelShaderProgram,
|
||||
withTexture ? "2DTexture" : "2DNoTexture", false);
|
||||
|
||||
COpenGL3CacheHandler *cacheHandler = Driver->getCacheHandler();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue