Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

change default window settings (#1656)

Browse source 
* consistent texture unit binding for screen

* change default pc settings for window size & display mode
This commit is contained in:
ManDude 2022-07-16 01:28:08 +01:00 committed by GitHub
parent 1c5f7dc3d5
commit afd7ee4504
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
game/graphics/opengl_renderer/OpenGLRenderer.cpp
View file

@ -462,7 +462,6 @@ void OpenGLRenderer::setup_frame(const RenderOptions& settings) {
if (fbo_state.tex2 == -1) {
glGenTextures(1, &fbo_state.tex2);
}
glActiveTexture(GL_TEXTURE30);
glBindTexture(GL_TEXTURE_2D, fbo_state.tex2);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, fbo_state.width, fbo_state.height, 0, GL_RGBA,
GL_UNSIGNED_BYTE, nullptr);

1
game/graphics/opengl_renderer/opengl_utils.cpp
View file

@ -142,7 +142,6 @@ void FullScreenDraw::draw(const math::Vector4f& color,
glBindBuffer(GL_ARRAY_BUFFER, m_vertex_buffer);
auto& shader = render_state->shaders[ShaderId::POST_PROCESSING];
shader.activate();
glUniform1i(glGetUniformLocation(shader.id(), "screen_tex"), 0);
glUniform4f(glGetUniformLocation(shader.id(), "fragment_color"), color[0], color[1], color[2],
color[3]);

2
game/graphics/opengl_renderer/shaders/post_processing.frag
View file

@ -6,7 +6,7 @@ out vec4 color;
uniform vec4 fragment_color;
layout (binding = 30) uniform sampler2D screen_tex;
layout (binding = 0) uniform sampler2D screen_tex;
void main() {
color = vec4(texture(screen_tex, screen_pos).rgb * fragment_color.a, 1.0);

6
goal_src/jak1/pc/pckernel-h.gc
View file

@ -418,14 +418,14 @@
(set! (-> obj target-fps) 60)
(pc-get-screen-size -1 (&-> obj width) (&-> obj height))
(set-aspect! obj 4 3)
(set! (-> obj use-vis?) #f)
(set! (-> obj aspect-ratio-auto?) #f)
(set! (-> obj aspect-ratio-auto?) #t)
(set! (-> obj vsync?) #t)
(set! (-> obj letterbox?) #t)
(set-display-mode! obj 'windowed)
(set-display-mode! obj 'fullscreen)
(set-size! obj PC_BASE_WIDTH PC_BASE_HEIGHT)
(set-aspect! obj 4 3)
(set! (-> obj gfx-msaa) 4) ;; 4x msaa