mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-02-04 23:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "graphics: Bug fix: More strict calculation for the nearest filter (#558)"

Browse Source 
This reverts commit bae8f9d874.

Reason: TravisCI failed
This commit is contained in:
Hajime Hoshi 2018-03-20 04:15:49 +09:00
parent a40dc5cf22
commit b157f2d6d0
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image_test.go
View File

@ -504,7 +504,7 @@ func TestImageFill(t *testing.T) {
} }
} }
// Issue #317, #558 // Issue #317
func TestImageEdge(t *testing.T) { func TestImageEdge(t *testing.T) {
const ( const (
img0Width = 16 img0Width = 16
@ -537,7 +537,7 @@ func TestImageEdge(t *testing.T) {
transparent := color.RGBA{0, 0, 0, 0} transparent := color.RGBA{0, 0, 0, 0}
for _, f := range []Filter{FilterNearest, FilterLinear} { for _, f := range []Filter{FilterNearest, FilterLinear} {
for a := 0; a < 360; a++ { for a := 0; a < 360; a += 5 {
img1.Clear() img1.Clear()
op := &DrawImageOptions{} op := &DrawImageOptions{}
w, h := img0.Size() w, h := img0.Size()

3
internal/graphics/program.go
View File

@ -321,6 +321,7 @@ func (s *openGLState) useProgram(proj []float32, texture opengl.Texture, dst, sr
s.lastColorMatrixTranslation = esTranslate s.lastColorMatrixTranslation = esTranslate
} }
if program == s.programLinear || program == s.programScreen {
sw, sh := src.Size() sw, sh := src.Size()
sw = emath.NextPowerOf2Int(sw) sw = emath.NextPowerOf2Int(sw)
sh = emath.NextPowerOf2Int(sh) sh = emath.NextPowerOf2Int(sh)
@ -330,7 +331,7 @@ func (s *openGLState) useProgram(proj []float32, texture opengl.Texture, dst, sr
s.lastSourceWidth = sw s.lastSourceWidth = sw
s.lastSourceHeight = sh s.lastSourceHeight = sh
} }
}
if program == s.programScreen { if program == s.programScreen {
sw, _ := src.Size() sw, _ := src.Size()
dw, _ := dst.Size() dw, _ := dst.Size()

36
internal/graphics/shader.go
View File

@ -76,7 +76,9 @@ uniform sampler2D texture;
uniform mat4 color_matrix; uniform mat4 color_matrix;
uniform vec4 color_matrix_translation; uniform vec4 color_matrix_translation;
#if defined(FILTER_LINEAR) || defined(FILTER_SCREEN)
uniform highp vec2 source_size; uniform highp vec2 source_size;
#endif
#if defined(FILTER_SCREEN) #if defined(FILTER_SCREEN)
uniform highp float scale; uniform highp float scale;
@ -102,10 +104,19 @@ void main(void) {
// roundTexel adjusts pos by rounding it (#315, #558). // roundTexel adjusts pos by rounding it (#315, #558).
pos = roundTexel(pos); pos = roundTexel(pos);
#if defined(FILTER_NEAREST)
vec4 color = texture2D(texture, pos);
if (pos.x < varying_tex_coord_min.x ||
pos.y < varying_tex_coord_min.y ||
varying_tex_coord_max.x <= pos.x ||
varying_tex_coord_max.y <= pos.y) {
color = vec4(0, 0, 0, 0);
}
#endif
#if defined(FILTER_LINEAR)
highp vec2 texel_size = 1.0 / source_size; highp vec2 texel_size = 1.0 / source_size;
#if defined(FILTER_NEAREST) || defined(FILTER_LINEAR)
// Even with the nearest filter, it is better to calculate the color with around 4 texels (#558).
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;
vec4 c0 = texture2D(texture, p0); vec4 c0 = texture2D(texture, p0);
@ -130,31 +141,14 @@ void main(void) {
} }
vec2 rate = fract(p0 * source_size); vec2 rate = fract(p0 * source_size);
#if defined(FILTER_NEAREST)
vec4 color;
if (rate.x < 0.5) {
if (rate.y < 0.5) {
color = c0;
} else {
color = c2;
}
} else {
if (rate.y < 0.5) {
color = c1;
} else {
color = c3;
}
}
#elif defined(FILTER_LINEAR)
vec4 color = mix(mix(c0, c1, rate.x), mix(c2, c3, rate.x), rate.y); vec4 color = mix(mix(c0, c1, rate.x), mix(c2, c3, rate.x), rate.y);
#endif #endif
#endif
#if defined(FILTER_SCREEN) #if defined(FILTER_SCREEN)
highp vec2 texel_size = 1.0 / source_size;
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;
vec4 c0 = texture2D(texture, p0); vec4 c0 = texture2D(texture, p0);
vec4 c1 = texture2D(texture, vec2(p1.x, p0.y)); vec4 c1 = texture2D(texture, vec2(p1.x, p0.y));
vec4 c2 = texture2D(texture, vec2(p0.x, p1.y)); vec4 c2 = texture2D(texture, vec2(p0.x, p1.y));