Skip to content

RC3 prep #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SoapyMan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

RC3 prep #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d191c
- premake: emscripten build_web folder to not conflict with linux .o
SoapyMan May 4, 2026
43e9951
#213 fix broken colors and color acne issues on certain HW/drivers an…
SoapyMan May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src_rebuild/PsyCross
Open in desktop
Submodule PsyCross updated 2 files
+4 −1 include/PsyX/PsyX_render.h
+276 −237 src/render/PsyX_render.cpp
6 changes: 5 additions & 1 deletion src_rebuild/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ end

workspace "REDRIVER2"
if _ACTION ~= "vscode" then
location "build"
if os.target() == "emscripten" then
location "build_web"
else
location "build"
end
else
-- setup VSCode generator settings
vscode_makefile "build"
Expand Down
13 changes: 8 additions & 5 deletions src_rebuild/utils/video_source/VideoPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ const char* fmv_shader =

TextureID g_FMVTexture = 0;
ShaderID g_FMVShader = 0;
GLuint g_FMVTextureLoc = 0;

#define DECODE_BUFFER_ALLOC (3840 * 2160 * 3) // RGB in 4K frame

Expand All @@ -267,6 +268,7 @@ void FMVPlayerInitGL()
#if defined(RENDERER_OGL) || defined(RENDERER_OGLES)
glGenTextures(1, &g_FMVTexture);

glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, g_FMVTexture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
Expand All @@ -278,7 +280,8 @@ void FMVPlayerInitGL()

if(!g_FMVShader)
{
g_FMVShader = GR_Shader_Compile(fmv_shader);
g_FMVShader = GR_Shader_Compile(fmv_shader, false);
g_FMVTextureLoc = glGetUniformLocation(g_FMVShader, "s_texture");
}
#endif
}
Expand Down Expand Up @@ -447,13 +450,13 @@ void DrawFrame(ReadAVI::stream_format_t& stream_format, int frame_number, int cr

GR_Clear(0, 0, windowWidth, windowHeight, 0, 0, 0);

glBindTexture(GL_TEXTURE_2D, g_FMVTexture);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, image_w, image_h, 0, GL_RGB, GL_UNSIGNED_BYTE, g_FMVDecodedImageBuffer);
glBindTexture(GL_TEXTURE_2D, 0);

GR_SetShader(g_FMVShader);
GR_SetTexture(g_FMVTexture, (TexFormat)-1);

glUniform1i(g_FMVTextureLoc, 0);
glBindTexture(GL_TEXTURE_2D, g_FMVTexture);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, image_w, image_h, 0, GL_RGB, GL_UNSIGNED_BYTE, g_FMVDecodedImageBuffer);

GR_SetScissorState(0);
GR_EnableDepth(0);
GR_SetStencilMode(0);
Expand Down