Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-04-26 16:46:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[client] egl: set a default scale for textures without filters"

Browse Source 
This reverts commit 57a74c156bb889ad020a40d37e5ca0c8d1b80921.
Pushed a ton of changes that should not have been pushed
This commit is contained in:
Geoffrey McRae 2021-08-09 18:26:30 +10:00
parent 57a74c156b
commit 79dcc6d4f1
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/renderers/EGL/CMakeLists.txt
View File

@ -25,8 +25,6 @@ make_object(
shader/splash_bg.frag shader/splash_bg.frag
shader/splash_logo.vert shader/splash_logo.vert
shader/splash_logo.frag shader/splash_logo.frag
shader/null.vert
shader/null.frag
) )
make_defines( make_defines(

13
client/renderers/EGL/desktop.c
View File

@ -34,9 +34,6 @@
#include <string.h> #include <string.h>
// these headers are auto generated by cmake // these headers are auto generated by cmake
#include "null.vert.h"
#include "null.frag.h"
#include "desktop.vert.h" #include "desktop.vert.h"
#include "desktop_rgb.frag.h" #include "desktop_rgb.frag.h"
#include "desktop_rgb.def.h" #include "desktop_rgb.def.h"
@ -78,8 +75,6 @@ struct EGL_Desktop
bool useDMA; bool useDMA;
LG_RendererFormat format; LG_RendererFormat format;
EGL_Shader * nullShader;
}; };
// forwards // forwards
@ -161,11 +156,6 @@ bool egl_desktopInit(EGL * egl, EGL_Desktop ** desktop, EGLDisplay * display,
(*desktop)->scaleAlgo = option_get_int("egl", "scale" ); (*desktop)->scaleAlgo = option_get_int("egl", "scale" );
(*desktop)->useDMA = useDMA; (*desktop)->useDMA = useDMA;
egl_shaderInit(&(*desktop)->nullShader);
egl_shaderCompile((*desktop)->nullShader,
b_shader_null_vert, b_shader_null_vert_size,
b_shader_null_frag, b_shader_null_frag_size);
return true; return true;
} }
@ -200,7 +190,6 @@ void egl_desktopFree(EGL_Desktop ** desktop)
egl_shaderFree (&(*desktop)->shader.shader); egl_shaderFree (&(*desktop)->shader.shader);
egl_desktopRectsFree(&(*desktop)->mesh ); egl_desktopRectsFree(&(*desktop)->mesh );
countedBufferRelease(&(*desktop)->matrix ); countedBufferRelease(&(*desktop)->matrix );
egl_shaderFree(&(*desktop)->nullShader);
free(*desktop); free(*desktop);
*desktop = NULL; *desktop = NULL;
@ -310,8 +299,6 @@ bool egl_desktop_update(EGL_Desktop * desktop, const FrameBuffer * frame, int dm
return false; return false;
} }
egl_textureAddShader(desktop->texture, desktop->nullShader, 4.0f);
if (!egl_desktopSetup(desktop, desktop->format)) if (!egl_desktopSetup(desktop, desktop->format))
return false; return false;
} }

1
client/renderers/EGL/texture.c
View File

@ -88,7 +88,6 @@ bool egl_textureInit(EGL * egl, EGL_Texture ** texture_,
glSamplerParameteri(this->sampler, GL_TEXTURE_WRAP_T , GL_CLAMP_TO_EDGE); glSamplerParameteri(this->sampler, GL_TEXTURE_WRAP_T , GL_CLAMP_TO_EDGE);
this->textures = ringbuffer_new(8, sizeof(GLuint)); this->textures = ringbuffer_new(8, sizeof(GLuint));
this->scale = 1.0f;
return true; return true;
} }