oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start moving core frameworks to external libraries

Browse Source
This commit is contained in:
itsmattkc
2023-01-19 09:51:47 -08:00
parent e7982239b8
commit dd9c52ab59
158 changed files with 478 additions and 2484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/opengl/openglrenderer.cpp
+15 -15
View File
@@ -189,7 +189,7 @@ void OpenGLRenderer::ClearDestination(Texture *texture, double r, double g, doub
}
}
QVariant OpenGLRenderer::CreateNativeTexture(int width, int height, int depth, VideoParams::Format format, int channel_count, const void *data, int linesize)
QVariant OpenGLRenderer::CreateNativeTexture(int width, int height, int depth, PixelFormat format, int channel_count, const void *data, int linesize)
{
GL_PREAMBLE;
@@ -673,10 +673,10 @@ void OpenGLRenderer::Blit(QVariant s, ShaderJob job, Texture *destination, Video
vao_.destroy();
}
GLint OpenGLRenderer::GetInternalFormat(VideoParams::Format format, int channel_layout)
GLint OpenGLRenderer::GetInternalFormat(PixelFormat format, int channel_layout)
{
switch (format) {
case VideoParams::kFormatUnsigned8:
case PixelFormat::U8:
switch (channel_layout) {
case 1:
return GL_R8;
@@ -688,7 +688,7 @@ GLint OpenGLRenderer::GetInternalFormat(VideoParams::Format format, int channel_
return GL_RGBA8;
}
break;
case VideoParams::kFormatUnsigned16:
case PixelFormat::U16:
switch (channel_layout) {
case 1:
return GL_R16;
@@ -700,7 +700,7 @@ GLint OpenGLRenderer::GetInternalFormat(VideoParams::Format format, int channel_
return GL_RGBA16;
}
break;
case VideoParams::kFormatFloat16:
case PixelFormat::F16:
switch (channel_layout) {
case 1:
return GL_R16F;
@@ -712,7 +712,7 @@ GLint OpenGLRenderer::GetInternalFormat(VideoParams::Format format, int channel_
return GL_RGBA16F;
}
break;
case VideoParams::kFormatFloat32:
case PixelFormat::F32:
switch (channel_layout) {
case 1:
return GL_R32F;
@@ -724,28 +724,28 @@ GLint OpenGLRenderer::GetInternalFormat(VideoParams::Format format, int channel_
return GL_RGBA32F;
}
break;
case VideoParams::kFormatInvalid:
case VideoParams::kFormatCount:
case PixelFormat::INVALID:
case PixelFormat::FORMAT_COUNT:
break;
}
return GL_INVALID_VALUE;
}
GLenum OpenGLRenderer::GetPixelType(VideoParams::Format format)
GLenum OpenGLRenderer::GetPixelType(PixelFormat format)
{
switch (format) {
case VideoParams::kFormatUnsigned8:
case PixelFormat::U8:
return GL_UNSIGNED_BYTE;
case VideoParams::kFormatUnsigned16:
case PixelFormat::U16:
return GL_UNSIGNED_SHORT;
case VideoParams::kFormatFloat16:
case PixelFormat::F16:
return GL_HALF_FLOAT;
case VideoParams::kFormatFloat32:
case PixelFormat::F32:
return GL_FLOAT;
case VideoParams::kFormatInvalid:
case VideoParams::kFormatCount:
case PixelFormat::INVALID:
case PixelFormat::FORMAT_COUNT:
break;
}
app/render/opengl/openglrenderer.h
+4 -4
View File
@@ -70,16 +70,16 @@ protected:
olive::VideoParams destination_params,
bool clear_destination) override;
virtual QVariant CreateNativeTexture(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
virtual QVariant CreateNativeTexture(int width, int height, int depth, PixelFormat format, int channel_count, const void* data = nullptr, int linesize = 0) override;
virtual void DestroyNativeTexture(QVariant texture) override;
virtual void DestroyInternal() override;
private:
static GLint GetInternalFormat(VideoParams::Format format, int channel_layout);
static GLint GetInternalFormat(PixelFormat format, int channel_layout);
static GLenum GetPixelType(VideoParams::Format format);
static GLenum GetPixelType(PixelFormat format);
static GLenum GetPixelFormat(int channel_count);
@@ -105,7 +105,7 @@ private:
int width;
int height;
int depth;
VideoParams::Format format;
PixelFormat format;
int channel_count;
bool operator==(const TextureCacheKey &rhs) const