diff --git a/app/build.gradle b/app/build.gradle index bc4fbcf89..a51f1e98b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { compile 'com.github.seven332:conaco:0.1.3-eh' compile 'com.github.seven332:easyrecyclerview:0.1.0' compile 'com.github.seven332:drawerLayout:0.1.0' - compile 'com.github.seven332:image:0.1.4' + compile 'com.github.seven332:image:0.1.5' compile 'com.github.seven332:okhttp:3.2.0-eh' compile 'com.github.seven332:refreshlayout:0.1.0' compile 'com.github.seven332:ripple:0.1.1' diff --git a/app/src/main/java/com/hippo/gl/glrenderer/ImageTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/ImageTexture.java index 3f09ca893..da0c28c07 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/ImageTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/ImageTexture.java @@ -173,7 +173,15 @@ public class ImageTexture implements Texture, Animatable { @Override protected void texImage(boolean init) { if (image != null && !image.isRecycled()) { - image.texImage(init, mTileType, offsetX, offsetY); + int w, h; + if (init) { + w = mTextureWidth; + h = mTextureHeight; + } else { + w = mWidth; + h = mHeight; + } + image.texImage(init, offsetX - borderSize, offsetY - borderSize, w, h); } } diff --git a/app/src/main/java/com/hippo/gl/glrenderer/NativeTexture.java b/app/src/main/java/com/hippo/gl/glrenderer/NativeTexture.java index 17d170cb0..268e30143 100644 --- a/app/src/main/java/com/hippo/gl/glrenderer/NativeTexture.java +++ b/app/src/main/java/com/hippo/gl/glrenderer/NativeTexture.java @@ -54,6 +54,7 @@ public abstract class NativeTexture extends BasicTexture { GLES20.glBindTexture(getTarget(), mId); checkError(); texImage(true); + checkError(); setAssociatedCanvas(canvas); mState = STATE_LOADED; @@ -68,6 +69,7 @@ public abstract class NativeTexture extends BasicTexture { GLES20.glBindTexture(getTarget(), mId); checkError(); texImage(false); + checkError(); mContentValid = true; } } diff --git a/app/src/main/java/com/hippo/gl/view/GLRootView.java b/app/src/main/java/com/hippo/gl/view/GLRootView.java index b59be50ec..3d03d5fbb 100644 --- a/app/src/main/java/com/hippo/gl/view/GLRootView.java +++ b/app/src/main/java/com/hippo/gl/view/GLRootView.java @@ -173,7 +173,7 @@ public class GLRootView extends GLSurfaceView long t = System.nanoTime(); long duration = (t - t0) / 1000000; - if (duration > 34) { + if (duration > 8) { Log.v(TAG, "--- " + duration + " ---"); } }