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

removed double buffered textures

Browse Source 
These functions never ended up getting used, and have the potential to become
confusing in implementation.
This commit is contained in:
itsmattkc
2019-12-09 23:59:00 +11:00
parent 26b3993b9d
commit 3dc563b697
4 changed files with 1 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/opengl/opengltexture.cpp
+1 -32
View File
@@ -28,7 +28,6 @@
OpenGLTexture::OpenGLTexture() :
context_(nullptr),
texture_(0),
back_texture_(0),
width_(0),
height_(0),
format_(olive::PIX_FMT_INVALID)
@@ -46,11 +45,6 @@ bool OpenGLTexture::IsCreated() const
}
void OpenGLTexture::Create(QOpenGLContext *ctx, int width, int height, const olive::PixelFormat &format, void* data)
{
Create(ctx, width, height, format, kSingleBuffer, data);
}
void OpenGLTexture::Create(QOpenGLContext *ctx, int width, int height, const olive::PixelFormat &format, const OpenGLTexture::Type &type, void *data)
{
if (ctx == nullptr) {
qWarning() << "RenderTexture::Create was passed an invalid context";
@@ -68,21 +62,11 @@ void OpenGLTexture::Create(QOpenGLContext *ctx, int width, int height, const oli
// Create main texture
CreateInternal(&texture_, data);
if (type == kDoubleBuffer) {
// Create back texture
CreateInternal(&back_texture_, nullptr);
}
}
void OpenGLTexture::Create(QOpenGLContext *ctx, FramePtr frame, const Type &type)
{
Create(ctx, frame->width(), frame->height(), frame->format(), type, frame->data());
}
void OpenGLTexture::Create(QOpenGLContext *ctx, FramePtr frame)
{
Create(ctx, frame, kSingleBuffer);
Create(ctx, frame->width(), frame->height(), frame->format(), frame->data());
}
void OpenGLTexture::Destroy()
@@ -93,9 +77,6 @@ void OpenGLTexture::Destroy()
context_->functions()->glDeleteTextures(1, &texture_);
texture_ = 0;
context_->functions()->glDeleteTextures(1, &back_texture_);
back_texture_ = 0;
context_ = nullptr;
}
}
@@ -145,18 +126,6 @@ const GLuint &OpenGLTexture::texture() const
return texture_;
}
const GLuint &OpenGLTexture::back_texture() const
{
return back_texture_;
}
void OpenGLTexture::SwapFrontAndBack()
{
GLuint temp = texture_;
texture_ = back_texture_;
back_texture_ = temp;
}
void OpenGLTexture::Upload(const void *data)
{
if (!IsCreated()) {