mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 18:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphicsdriver/opengl: Bug fix: filter is a preserved keyword (#771)

Browse Source
This commit is contained in:
Hajime Hoshi 2019-01-07 11:20:29 +09:00
parent 7f656f11d6
commit 758b957b01
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/graphicsdriver/opengl/program.go
View File

@ -292,7 +292,7 @@ func (d *Driver) useProgram(mode graphics.CompositeMode, colorM *affine.ColorM,
} }
if d.state.lastFilter == nil || *d.state.lastFilter != filter { if d.state.lastFilter == nil || *d.state.lastFilter != filter {
d.context.uniformInt(program, "filter", int(filter)) d.context.uniformInt(program, "filter_type", int(filter))
d.state.lastFilter = &filter d.state.lastFilter = &filter
} }
if d.state.lastAddress == nil || *d.state.lastAddress != address { if d.state.lastAddress == nil || *d.state.lastAddress != address {

8
internal/graphicsdriver/opengl/shader.go
View File

@ -94,7 +94,7 @@ uniform sampler2D texture;
uniform mat4 color_matrix_body; uniform mat4 color_matrix_body;
uniform vec4 color_matrix_translation; uniform vec4 color_matrix_translation;
uniform int filter; uniform int filter_type;
uniform highp vec2 source_size; uniform highp vec2 source_size;
uniform int address; uniform int address;
@ -146,7 +146,7 @@ void main(void) {
vec4 color; vec4 color;
if (filter == FILTER_NEAREST) { if (filter_type == FILTER_NEAREST) {
pos = adjustTexelByAddress(pos, varying_tex_region, address); pos = adjustTexelByAddress(pos, varying_tex_region, address);
color = texture2D(texture, pos); color = texture2D(texture, pos);
if (pos.x < varying_tex_region[0] || if (pos.x < varying_tex_region[0] ||
@ -155,7 +155,7 @@ void main(void) {
(varying_tex_region[3] - texel_size.y / 512.0) <= pos.y) { (varying_tex_region[3] - texel_size.y / 512.0) <= pos.y) {
color = vec4(0, 0, 0, 0); color = vec4(0, 0, 0, 0);
} }
} else if (filter == FILTER_LINEAR) { } else if (filter_type == FILTER_LINEAR) {
highp vec2 p0 = pos - texel_size / 2.0; highp vec2 p0 = pos - texel_size / 2.0;
highp vec2 p1 = pos + texel_size / 2.0; highp vec2 p1 = pos + texel_size / 2.0;
@ -186,7 +186,7 @@ void main(void) {
vec2 rate = fract(p0 * source_size); vec2 rate = fract(p0 * source_size);
color = mix(mix(c0, c1, rate.x), mix(c2, c3, rate.x), rate.y); color = mix(mix(c0, c1, rate.x), mix(c2, c3, rate.x), rate.y);
} else if (filter == FILTER_SCREEN) { } else if (filter_type == FILTER_SCREEN) {
highp vec2 p0 = pos - texel_size / 2.0 / scale; highp vec2 p0 = pos - texel_size / 2.0 / scale;
highp vec2 p1 = pos + texel_size / 2.0 / scale; highp vec2 p1 = pos + texel_size / 2.0 / scale;