Skip to content

Commit

Permalink
ogl upscale on mesa
Browse files Browse the repository at this point in the history
  • Loading branch information
@xzn
xzn committed Feb 21, 2024
1 parent 938865b commit f68e45f
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ include/ncnn
lib

ntrviewer*
_win32*
_win32*
_pkg
_test
88 changes: 79 additions & 9 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void Sleep(int milliseconds) {
#define JCS_FORMAT JCS_EXT_RGBA

int realcugan_create();
GLuint realcugan_run(int top_bot, int w, int h, int c, const unsigned char *indata, unsigned char *outdata);
GLuint realcugan_run(int top_bot, int w, int h, int c, const unsigned char *indata, unsigned char *outdata, bool *dim3);
void realcugan_destroy();

#define fprintf(s, f, ...) fprintf(s, "%s:%d:%s " f, __FILE__, __LINE__, __func__, ## __VA_ARGS__)
Expand Down Expand Up @@ -1343,7 +1343,13 @@ static void guiMain(struct nk_context *ctx)
nk_window_show(ctx, debug_msg_wnd, show_window);
}

#ifdef USE_OGL_ES
#define GLSL_VERSION "#version 100\n" "precision mediump float; \n"
#else
#define GLSL_VERSION "#version 110\n"
#endif
static GLbyte vShaderStr[] =
GLSL_VERSION
"attribute vec4 a_position; \n"
"attribute vec2 a_texCoord; \n"
"varying vec2 v_texCoord; \n"
Expand All @@ -1354,16 +1360,17 @@ static GLbyte vShaderStr[] =
"} \n";

static GLbyte fShaderStr[] =
"precision mediump float; \n"
GLSL_VERSION
"varying vec2 v_texCoord; \n"
"uniform sampler2D s_texture; \n"
"void main() \n"
"{ \n"
" gl_FragColor = texture2D(s_texture, v_texCoord); \n"
"} \n";

#if 0
#ifdef USE_OGL_ES
#define GLSL_FBO_VERSION "#version 320 es\n"
#define GLSL_FBO_VERSION "#version 320 es\n" "precision mediump float; \n"
#else
#define GLSL_FBO_VERSION "#version 430\n"
#endif
Expand All @@ -1380,7 +1387,6 @@ static GLbyte fbo_vShaderStr[] =

static GLbyte fbo_fShaderStr[] =
GLSL_FBO_VERSION
"precision mediump float; \n"
"in vec2 v_texCoord; \n"
"uniform samplerBuffer mediump s_texture; \n"
"uniform int v_texSize; \n"
Expand All @@ -1389,6 +1395,37 @@ static GLbyte fbo_fShaderStr[] =
"{ \n"
" outColor = texelFetch(s_texture, int(v_texCoord.y) * v_texSize + int(v_texCoord.x)); \n"
"} \n";
#else
#ifdef USE_OGL_ES
#define GLSL_FBO_VERSION "#version 100 es\n" "precision mediump float; \n"
#else
#define GLSL_FBO_VERSION "#version 110\n"
#endif
static GLbyte fbo_vShaderStr[] =
GLSL_FBO_VERSION
"attribute vec4 a_position; \n"
"attribute vec2 a_texCoord; \n"
"varying vec2 v_texCoord; \n"
"void main() \n"
"{ \n"
" gl_Position = a_position; \n"
" v_texCoord = a_texCoord; \n"
"} \n";

static GLbyte fbo_fShaderStr[] =
GLSL_FBO_VERSION
"varying vec2 v_texCoord; \n"
"uniform sampler3D s_texture; \n"
"void main() \n"
"{ \n"
" gl_FragColor = vec4("
"texture3D(s_texture, vec3(v_texCoord, 0.0)).x / 255.0,"
"texture3D(s_texture, vec3(v_texCoord, 1.0 / 3.0)).x / 255.0,"
"texture3D(s_texture, vec3(v_texCoord, 2.0 / 3.0)).x / 255.0,"
"texture3D(s_texture, vec3(v_texCoord, 1.0)).x / 255.0"
");\n"
"} \n";
#endif

static GLfloat fbo_vVertices_pos[4][3] = {
{ -1.f, -1.f, 0.0f }, // Position 1
Expand Down Expand Up @@ -1663,10 +1700,11 @@ static void do_hr_draw_screen(FrameBufferContext *ctx, int index, int width, int
nk_bool upscaled = screen_upscale_factor > 1 && upscaling_filter && upscaling_filter_created;
int scale = upscaled ? screen_upscale_factor : 1;
GLuint tex = upscaled ? ctx->gl_tex_upscaled : ctx->gl_tex_id;
bool dim3 = false;

if (upscaled) {
scale = screen_upscale_factor;
GLuint tex_upscaled = sr_run(top_bot, height, width, GL_CHANNELS_N, ctx->images[index], screen_upscaled);
GLuint tex_upscaled = sr_run(top_bot, height, width, GL_CHANNELS_N, ctx->images[index], screen_upscaled, &dim3);
if (!tex_upscaled) {
#if 0
upscaled = 0;
Expand Down Expand Up @@ -1715,8 +1753,39 @@ static void do_hr_draw_screen(FrameBufferContext *ctx, int index, int width, int
glBindTexture(GL_TEXTURE_2D, ctx->gl_tex_upscaled);
tex = ctx->gl_tex_upscaled;
} else {
glBindTexture(GL_TEXTURE_2D, tex_upscaled);
tex = tex_upscaled;
if (dim3) {
glBindTexture(GL_TEXTURE_3D, tex_upscaled);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, ctx->gl_fbo_upscaled[tb]);
glViewport(0, 0, height * scale, width * scale);
glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);

glUseProgram(gl_fbo_program);
fbo_vVertices_tex_coord[0][0] = 0;
fbo_vVertices_tex_coord[0][1] = 0;
fbo_vVertices_tex_coord[1][0] = 0;
fbo_vVertices_tex_coord[1][1] = 1;
fbo_vVertices_tex_coord[2][0] = 1;
fbo_vVertices_tex_coord[2][1] = 0;
fbo_vVertices_tex_coord[3][0] = 1;
fbo_vVertices_tex_coord[3][1] = 1;

glVertexAttribPointer(gl_fbo_position_loc, 3, GL_FLOAT, GL_FALSE, sizeof(*fbo_vVertices_pos), fbo_vVertices_pos);
glVertexAttribPointer(gl_fbo_tex_coord_loc, 2, GL_FLOAT, GL_FALSE, sizeof(*fbo_vVertices_tex_coord), fbo_vVertices_tex_coord);
glEnableVertexAttribArray(gl_fbo_position_loc);
glEnableVertexAttribArray(gl_fbo_tex_coord_loc);

glUniform1i(gl_fbo_sampler_loc, 0);
if (0)
glUniform1i(gl_fbo_tex_size_loc, height * scale);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, fbo_indices);

glBindTexture(GL_TEXTURE_2D, ctx->gl_tex_upscaled);
tex = ctx->gl_tex_upscaled;
} else {
glBindTexture(GL_TEXTURE_2D, tex_upscaled);
tex = tex_upscaled;
}
}
}
}
Expand Down Expand Up @@ -2609,12 +2678,13 @@ int main(int argc, char *argv[])
gl_tex_coord_loc = glGetAttribLocation(gl_program, "a_texCoord");
gl_sampler_loc = glGetUniformLocation(gl_program, "s_texture");

if (0) {
if (1) {
gl_fbo_program = LoadProgram((const char *)fbo_vShaderStr, (const char *)fbo_fShaderStr);
gl_fbo_position_loc = glGetAttribLocation(gl_fbo_program, "a_position");
gl_fbo_tex_coord_loc = glGetAttribLocation(gl_fbo_program, "a_texCoord");
gl_fbo_sampler_loc = glGetUniformLocation(gl_fbo_program, "s_texture");
gl_fbo_tex_size_loc = glGetUniformLocation(gl_fbo_program, "v_texSize");
if (0)
gl_fbo_tex_size_loc = glGetUniformLocation(gl_fbo_program, "v_texSize");
}

rpConfigSetDefault();
Expand Down
3 changes: 2 additions & 1 deletion realcugan-ncnn-vulkan/lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,15 @@ extern "C" int realcugan_create()
return 0;
}

extern "C" GLuint realcugan_run(int top_bot, int w, int h, int c, const unsigned char *indata, unsigned char *outdata)
extern "C" GLuint realcugan_run(int top_bot, int w, int h, int c, const unsigned char *indata, unsigned char *outdata, bool *dim3)
{
ncnn::Mat inimage = ncnn::Mat(w, h, (void*)indata, (size_t)c, c);
ncnn::Mat outimage = ncnn::Mat(w * scale, h * scale, (void*)outdata, (size_t)c, c);
if (realcugan[top_bot]->process(inimage, outimage) != 0) {
return 0;
}
// return realcugan[top_bot]->out_gpu->gl_texture;
*dim3 = realcugan[top_bot]->out_gpu_tex->depth > 1;
return realcugan[top_bot]->out_gpu_tex->gl_texture;
}

Expand Down
23 changes: 21 additions & 2 deletions realcugan-ncnn-vulkan/realcugan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,17 @@ int RealCUGAN::load(const std::string& parampath, const std::string& modelpath)
#endif
{
net.opt.use_vulkan_compute = vkdev ? true : false;
#if 1
net.opt.use_fp16_packed = true;
net.opt.use_fp16_storage = vkdev ? true : false;
net.opt.use_fp16_arithmetic = false;
net.opt.use_int8_storage = true;

#else
net.opt.use_fp16_packed = false;
net.opt.use_fp16_storage = false;
net.opt.use_fp16_arithmetic = false;
net.opt.use_int8_storage = false;
#endif
net.set_vulkan_device(vkdev);

#if _WIN32
Expand Down Expand Up @@ -4033,6 +4039,7 @@ void OutVkMat::create(const RealCUGAN* cugan, int _w, int _h, size_t _elemsize,
data = out_create(cugan, totalsize);

if (data) create_handles(cugan);
else release(cugan);
}
else
{
Expand Down Expand Up @@ -4066,6 +4073,7 @@ void OutVkMat::create(const RealCUGAN* cugan, int _w, int _h, int _c, size_t _el
data = out_create(cugan, totalsize);

if (data) create_handles(cugan);
else release(cugan);
}
else
{
Expand Down Expand Up @@ -4219,6 +4227,10 @@ static VkImageMemory* out_create(const RealCUGAN* cugan, int w, int h, int c, si
{
format = VK_FORMAT_R8G8B8A8_UNORM;
}
else if (c == 4 && elemsize / elempack == 4 && elempack == 1)
{
format = VK_FORMAT_R32_SFLOAT;
}
else
{
NCNN_LOGE("not supported params combination");
Expand Down Expand Up @@ -4395,6 +4407,7 @@ void OutVkImageMat::create(const RealCUGAN* cugan, int _w, int _h, size_t _elems
data = out_create(cugan, w, h, c, elemsize, elempack, totalsize);

if (data) create_handles(cugan);
else release(cugan);
}
else
{
Expand Down Expand Up @@ -4426,6 +4439,7 @@ void OutVkImageMat::create(const RealCUGAN* cugan, int _w, int _h, int _c, size_
data = out_create(cugan, w, h, c, elemsize, elempack, totalsize);

if (data) create_handles(cugan);
else release(cugan);
}
else
{
Expand Down Expand Up @@ -4526,8 +4540,13 @@ void OutVkImageMat::create_handles(const RealCUGAN* cugan)
} else {
glBindTexture(GL_TEXTURE_3D, gl_texture);
glTextureStorageMem3DEXT(
gl_texture, 1, GL_RGBA8, width, // TODO it's actually float something not GL_RGBA8
gl_texture, 1, GL_R32F, width,
height, depth, gl_memory, 0);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
glBindTexture(GL_TEXTURE_3D, 0);
}
}
Expand Down

0 comments on commit f68e45f

Please sign in to comment.