izzy/libultraship
0
0
Fork 0
mirror of https://github.com/izzy2lost/libultraship.git synced 2026-06-19 01:16:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bump prism and fixed texture filtering on opengl (#873)

Browse Source 
* Bump prism and fixed texture filtering on opengl

* Reverted wrong defines

* Commented log

* Fixed tidy

* Fixed prism compilation issue

* Readded toggleable filtering
This commit is contained in:
Lywx
2025-05-12 17:52:23 -04:00
committed by GitHub
parent 5e55855610
commit 7db23dc88f
5 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/dependencies/common.cmake
+1 -1
View File
@@ -108,6 +108,6 @@ option(PRISM_STANDALONE "Build prism as a standalone library" OFF)
FetchContent_Declare(
prism
GIT_REPOSITORY https://github.com/KiritoDv/prism-processor.git
GIT_TAG fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850
GIT_TAG 493974843e910d0fac4e3bb1ec52656728b875b4
)
FetchContent_MakeAvailable(prism)
src/graphic/Fast3D/gfx_direct3d_common.cpp
+1 -3
View File
@@ -91,9 +91,7 @@ static const char* prism_shader_item_to_str(uint32_t item, bool with_alpha, bool
}
bool prism_get_bool(prism::ContextTypes* value) {
if (std::holds_alternative<bool>(*value)) {
return std::get<bool>(*value);
} else if (std::holds_alternative<int>(*value)) {
if (std::holds_alternative<int>(*value)) {
return std::get<int>(*value) == 1;
}
return false;
src/graphic/Fast3D/gfx_metal_shader.cpp
+1 -3
View File
@@ -102,9 +102,7 @@ static const char* p_shader_item_to_str(uint32_t item, bool with_alpha, bool onl
}
bool p_get_bool(prism::ContextTypes* value) {
if (std::holds_alternative<bool>(*value)) {
return std::get<bool>(*value);
} else if (std::holds_alternative<int>(*value)) {
if (std::holds_alternative<int>(*value)) {
return std::get<int>(*value) == 1;
}
return false;
src/graphic/Fast3D/gfx_opengl.cpp
+43 -8
View File
@@ -61,6 +61,9 @@ struct ShaderProgram {
uint8_t num_attribs;
GLint frame_count_location;
GLint noise_scale_location;
GLint texture_width_location;
GLint texture_height_location;
GLint texture_filtering_location;
};
struct Framebuffer {
@@ -73,6 +76,7 @@ struct Framebuffer {
};
static map<pair<uint64_t, uint32_t>, struct ShaderProgram> shader_program_pool;
static struct ShaderProgram* current_shader_program;
static GLuint opengl_vbo;
#if defined(__APPLE__) || defined(USE_OPENGLES)
static GLuint opengl_vao;
@@ -96,6 +100,15 @@ GLint max_msaa_level = 1;
GLuint pixel_depth_rb, pixel_depth_fb;
size_t pixel_depth_rb_size;
struct TextureInfo {
uint16_t width;
uint16_t height;
uint16_t filtering;
} textures[1024];
static GLuint current_texture_ids[2];
static uint8_t current_tile;
static int gfx_opengl_get_max_texture_size() {
GLint max_texture_size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
@@ -127,6 +140,19 @@ static void gfx_opengl_set_uniforms(struct ShaderProgram* prg) {
glUniform1f(prg->noise_scale_location, current_noise_scale);
}
static void gfx_opengl_set_per_draw_uniforms() {
if (current_shader_program->used_textures[0] || current_shader_program->used_textures[1]) {
GLint filtering[2] = { textures[current_texture_ids[0]].filtering, textures[current_texture_ids[1]].filtering };
glUniform1iv(current_shader_program->texture_filtering_location, 2, filtering);
GLint width[2] = { textures[current_texture_ids[0]].width, textures[current_texture_ids[1]].width };
glUniform1iv(current_shader_program->texture_width_location, 2, width);
GLint height[2] = { textures[current_texture_ids[0]].height, textures[current_texture_ids[1]].height };
glUniform1iv(current_shader_program->texture_height_location, 2, height);
}
}
static void gfx_opengl_unload_shader(struct ShaderProgram* old_prg) {
if (old_prg != NULL) {
for (int i = 0; i < old_prg->num_attribs; i++) {
@@ -137,6 +163,7 @@ static void gfx_opengl_unload_shader(struct ShaderProgram* old_prg) {
static void gfx_opengl_load_shader(struct ShaderProgram* new_prg) {
// if (!new_prg) return;
current_shader_program = new_prg;
glUseProgram(new_prg->opengl_program_id);
gfx_opengl_vertex_array_set_attribs(new_prg);
gfx_opengl_set_uniforms(new_prg);
@@ -233,9 +260,7 @@ static const char* shader_item_to_str(uint32_t item, bool with_alpha, bool only_
}
bool get_bool(prism::ContextTypes* value) {
if (std::holds_alternative<bool>(*value)) {
return std::get<bool>(*value);
} else if (std::holds_alternative<int>(*value)) {
if (std::holds_alternative<int>(*value)) {
return std::get<int>(*value) == 1;
}
return false;
@@ -286,7 +311,7 @@ std::optional<std::string> opengl_include_fs(const std::string& path) {
init->Type = (uint32_t)Ship::ResourceType::Shader;
init->ByteOrder = Ship::Endianness::Native;
init->Format = RESOURCE_FORMAT_BINARY;
auto res = static_pointer_cast<Ship::Shader>(
auto res = std::static_pointer_cast<Ship::Shader>(
Ship::Context::GetInstance()->GetResourceManager()->LoadResource(path, true, init));
if (res == nullptr) {
return std::nullopt;
@@ -316,7 +341,6 @@ static std::string build_fs_shader(const CCFeatures& cc_features) {
{ "o_do_single", M_ARRAY(cc_features.do_single, bool, 2, 2) },
{ "o_do_multiply", M_ARRAY(cc_features.do_multiply, bool, 2, 2) },
{ "o_color_alpha_same", M_ARRAY(cc_features.color_alpha_same, bool, 2) },
{ "o_current_filter", current_filter_mode },
{ "FILTER_THREE_POINT", FILTER_THREE_POINT },
{ "FILTER_LINEAR", FILTER_LINEAR },
{ "FILTER_NONE", FILTER_NONE },
@@ -336,6 +360,7 @@ static std::string build_fs_shader(const CCFeatures& cc_features) {
{ "SHADER_1", SHADER_1 },
{ "SHADER_COMBINED", SHADER_COMBINED },
{ "SHADER_NOISE", SHADER_NOISE },
{ "o_three_point_filtering", current_filter_mode == FILTER_THREE_POINT },
{ "append_formula", (InvokeFunc)append_formula },
#ifdef __APPLE__
{ "GLSL_VERSION", "#version 410 core" },
@@ -365,7 +390,7 @@ static std::string build_fs_shader(const CCFeatures& cc_features) {
init->Type = (uint32_t)Ship::ResourceType::Shader;
init->ByteOrder = Ship::Endianness::Native;
init->Format = RESOURCE_FORMAT_BINARY;
auto res = static_pointer_cast<Ship::Shader>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
auto res = std::static_pointer_cast<Ship::Shader>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
"shaders/opengl/default.shader.fs", true, init));
if (res == nullptr) {
@@ -423,7 +448,7 @@ static std::string build_vs_shader(const CCFeatures& cc_features) {
init->Type = (uint32_t)Ship::ResourceType::Shader;
init->ByteOrder = Ship::Endianness::Native;
init->Format = RESOURCE_FORMAT_BINARY;
auto res = static_pointer_cast<Ship::Shader>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
auto res = std::static_pointer_cast<Ship::Shader>(Ship::Context::GetInstance()->GetResourceManager()->LoadResource(
"shaders/opengl/default.shader.vs", true, init));
if (res == nullptr) {
@@ -542,6 +567,9 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
prg->frame_count_location = glGetUniformLocation(shader_program, "frame_count");
prg->noise_scale_location = glGetUniformLocation(shader_program, "noise_scale");
prg->texture_width_location = glGetUniformLocation(shader_program, "texture_width");
prg->texture_height_location = glGetUniformLocation(shader_program, "texture_height");
prg->texture_filtering_location = glGetUniformLocation(shader_program, "texture_filtering");
gfx_opengl_load_shader(prg);
@@ -597,10 +625,14 @@ static void gfx_opengl_delete_texture(uint32_t texID) {
static void gfx_opengl_select_texture(int tile, GLuint texture_id) {
glActiveTexture(GL_TEXTURE0 + tile);
glBindTexture(GL_TEXTURE_2D, texture_id);
current_texture_ids[tile] = texture_id;
current_tile = tile;
}
static void gfx_opengl_upload_texture(const uint8_t* rgba32_buf, uint32_t width, uint32_t height) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgba32_buf);
textures[current_texture_ids[current_tile]].width = width;
textures[current_texture_ids[current_tile]].height = height;
}
#ifdef USE_OPENGLES
@@ -622,10 +654,11 @@ static uint32_t gfx_cm_to_opengl(uint32_t val) {
}
static void gfx_opengl_set_sampler_parameters(int tile, bool linear_filter, uint32_t cms, uint32_t cmt) {
const GLint filter = linear_filter && current_filter_mode == FILTER_LINEAR ? GL_LINEAR : GL_NEAREST;
glActiveTexture(GL_TEXTURE0 + tile);
GLint filter = linear_filter && current_filter_mode == FILTER_LINEAR ? GL_LINEAR : GL_NEAREST;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
textures[current_texture_ids[tile]].filtering = !linear_filter ? FILTER_LINEAR : FILTER_THREE_POINT;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, gfx_cm_to_opengl(cms));
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, gfx_cm_to_opengl(cmt));
}
@@ -705,6 +738,8 @@ static void gfx_opengl_draw_triangles(float buf_vbo[], size_t buf_vbo_len, size_
}
}
gfx_opengl_set_per_draw_uniforms();
// printf("flushing %d tris\n", buf_vbo_num_tris);
glBufferData(GL_ARRAY_BUFFER, sizeof(float) * buf_vbo_len, buf_vbo, GL_STREAM_DRAW);
glDrawArrays(GL_TRIANGLES, 0, 3 * buf_vbo_num_tris);
src/graphic/Fast3D/shaders/opengl/default.shader.fs
+16 -15
View File
@@ -44,6 +44,10 @@ out vec4 vOutColor;
uniform int frame_count;
uniform float noise_scale;
uniform int texture_width[2];
uniform int texture_height[2];
uniform int texture_filtering[2];
#define TEX_OFFSET(off) @{texture}(tex, texCoord - off / texSize)
#define WRAP(x, low, high) mod((x)-(low), (high)-(low)) + (low)
@@ -59,7 +63,6 @@ vec4 fromLinear(vec4 linearRGB){
return vec4(mix(higher, lower, cutoff), linearRGB.a);
}
@if(o_current_filter == FILTER_THREE_POINT)
vec4 filter3point(in sampler2D tex, in vec2 texCoord, in vec2 texSize) {
vec2 offset = fract(texCoord*texSize - vec2(0.5));
offset -= step(1.0, offset.x + offset.y);
@@ -69,14 +72,16 @@ vec4 filter3point(in sampler2D tex, in vec2 texCoord, in vec2 texSize) {
return c0 + abs(offset.x)*(c1-c0) + abs(offset.y)*(c2-c0);
}
vec4 hookTexture2D(in sampler2D tex, in vec2 uv, in vec2 texSize) {
return filter3point(tex, uv, texSize);
}
@else
vec4 hookTexture2D(in sampler2D tex, in vec2 uv, in vec2 texSize) {
vec4 hookTexture2D(in int id, sampler2D tex, in vec2 uv, in vec2 texSize) {
@if(o_three_point_filtering)
if(texture_filtering[id] == @{FILTER_THREE_POINT}) {
return filter3point(tex, uv, texSize);
}
@end
return @{texture}(tex, uv);
}
@end
#define TEX_SIZE(tex) vec2(texture_width[tex], texture_height[tex])
void main() {
@for(i in 0..2)
@@ -84,11 +89,7 @@ void main() {
@{s = o_clamp[i][0]}
@{t = o_clamp[i][1]}
@if(opengles)
vec2 texSize@{i} = vec2(textureSize(uTex@{i}, 0));
@else
vec2 texSize@{i} = textureSize(uTex@{i}, 0);
@end
vec2 texSize@{i} = TEX_SIZE(@{i});
@if(!s && !t)
vec2 vTexCoordAdj@{i} = vTexCoord@{i};
@@ -102,7 +103,7 @@ void main() {
@end
@end
vec4 texVal@{i} = hookTexture2D(uTex@{i}, vTexCoordAdj@{i}, texSize@{i});
vec4 texVal@{i} = hookTexture2D(@{i}, uTex@{i}, vTexCoordAdj@{i}, texSize@{i});
@if(o_masks[i])
@if(opengles)
@@ -111,10 +112,10 @@ void main() {
vec2 maskSize@{i} = textureSize(uTexMask@{i}, 0);
@end
vec4 maskVal@{i} = hookTexture2D(uTexMask@{i}, vTexCoordAdj@{i}, maskSize@{i});
vec4 maskVal@{i} = hookTexture2D(@{i}, uTexMask@{i}, vTexCoordAdj@{i}, maskSize@{i});
@if(o_blend[i])
vec4 blendVal@{i} = hookTexture2D(uTexBlend@{i}, vTexCoordAdj@{i}, texSize@{i});
vec4 blendVal@{i} = hookTexture2D(@{i}, uTexBlend@{i}, vTexCoordAdj@{i}, texSize@{i});
@else
vec4 blendVal@{i} = vec4(0, 0, 0, 0);
@end