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

opengl: update for shader changes mentioned earlier

Browse Source
This commit is contained in:
itsmattkc
2020-11-22 10:32:22 +11:00
parent 425e69c789
commit 81447c439f
1 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/opengl/openglrenderer.cpp
+7 -32
View File
@@ -169,13 +169,13 @@ QVariant OpenGLRenderer::CreateNativeTexture2D(int width, int height, VideoParam
functions_->glBindTexture(GL_TEXTURE_2D, texture); functions_->glBindTexture(GL_TEXTURE_2D, texture);
{ {
PRINT_GL_ERRORS; PRINT_GL_ERRORS;
functions_->glTexImage2D(GL_TEXTURE_2D, 0, GetInternalFormat(format, channel_count), functions_->glTexImage2D(GL_TEXTURE_2D, 0, GetInternalFormat(format, channel_count),
width, height, 0, GetPixelFormat(channel_count), width, height, 0, GetPixelFormat(channel_count),
GetPixelType(format), data); GetPixelType(format), data);
} }
functions_->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); functions_->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
@@ -418,35 +418,15 @@ void OpenGLRenderer::Blit(QVariant s, ShaderJob job, Texture *destination, Video
iterative_name = it.key(); iterative_name = it.key();
} }
GLuint tex_id = texture ? texture->id().value<GLuint>() : 0;
textures_to_bind.append({texture, job.GetInterpolation(it.key())}); textures_to_bind.append({texture, job.GetInterpolation(it.key())});
// Set enable flag if shader wants it // Set enable flag if shader wants it
GLuint tex_id = texture ? texture->id().value<GLuint>() : 0;
int enable_param_location = shader->uniformLocation(QStringLiteral("%1_enabled").arg(it.key())); int enable_param_location = shader->uniformLocation(QStringLiteral("%1_enabled").arg(it.key()));
if (enable_param_location > -1) { if (enable_param_location > -1) {
shader->setUniformValue(enable_param_location, shader->setUniformValue(enable_param_location,
tex_id > 0); tex_id > 0);
} }
if (tex_id > 0) {
// Set texture resolution if shader wants it
int res_param_location = shader->uniformLocation(QStringLiteral("%1_resolution").arg(it.key()));
if (res_param_location > -1) {
int virtual_width = texture->params().width();
// Adjust virtual width by pixel aspect if necessary
if (texture->params().pixel_aspect_ratio() != 1
|| destination_params.pixel_aspect_ratio() != 1) {
double relative_pixel_aspect = texture->params().pixel_aspect_ratio().toDouble() / destination_params.pixel_aspect_ratio().toDouble();
virtual_width = qRound(static_cast<double>(virtual_width) * relative_pixel_aspect);
}
shader->setUniformValue(res_param_location,
virtual_width,
static_cast<GLfloat>(texture->height() * texture->divider()));
}
}
break; break;
} }
case NodeInput::kSamples: case NodeInput::kSamples:
@@ -483,11 +463,6 @@ void OpenGLRenderer::Blit(QVariant s, ShaderJob job, Texture *destination, Video
PrepareInputTexture(target, t.interpolation); PrepareInputTexture(target, t.interpolation);
} }
// Set ove_resolution to the destination to the "logical" resolution of the destination
shader->setUniformValue("ove_resolution",
static_cast<GLfloat>(destination_params.width()),
static_cast<GLfloat>(destination_params.height()));
// Ensure matrix is set, at least to identity // Ensure matrix is set, at least to identity
shader->setUniformValue("ove_mvpmat", shader->setUniformValue("ove_mvpmat",
job.GetValue(QStringLiteral("ove_mvpmat")).data.value<QMatrix4x4>()); job.GetValue(QStringLiteral("ove_mvpmat")).data.value<QMatrix4x4>());