Skip to content

fix(android): Canvas was getting blank because of unexpected flush calls #85

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

Merged
merged 2 commits into from
Aug 8, 2022
Merged

fix(android): Canvas was getting blank because of unexpected flush calls #85

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
d5af63b
fix(android): Canvas was getting blank because of unexpected flush calls
CatchABus Aug 8, 2022
0d2b1b3
chore: Removed invalid comment
CatchABus Aug 8, 2022
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
4 changes: 3 additions & 1 deletion .../canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/CPUView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ class CPUView @JvmOverloads constructor(
canvasView?.get()?.let { canvas ->
if (canvas.nativeContext != 0L) {
canvas.queueEvent {
// We don't want pending flags that were set up to this point
canvas.invalidateState = canvas.invalidateState and TNSCanvas.INVALIDATE_STATE_PENDING.inv()
TNSCanvas.nativeCustomWithBitmapFlush(canvas.nativeContext, it)
handler!!.post {
canvas.invalidateState = TNSCanvas.InvalidateState.NONE
canvas.invalidateState = canvas.invalidateState and TNSCanvas.INVALIDATE_STATE_INVALIDATING.inv()
invalidate()
}
}
Expand Down
10 changes: 7 additions & 3 deletions ...anvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,23 @@ internal class GLContext {
queueEvent {
if (reference != null) {
val canvasView = reference!!.get()
if (canvasView != null && canvasView.nativeContext != 0L && canvasView.invalidateState == TNSCanvas.InvalidateState.INVALIDATING) {
if (canvasView != null && canvasView.nativeContext != 0L && (canvasView.invalidateState and TNSCanvas.INVALIDATE_STATE_INVALIDATING) == TNSCanvas.INVALIDATE_STATE_INVALIDATING) {
// We don't want pending flags that were set up to this point
canvasView.invalidateState = canvasView.invalidateState and TNSCanvas.INVALIDATE_STATE_PENDING.inv()

TNSCanvas.nativeFlush(canvasView.nativeContext)
if (!mGLThread!!.getPaused() && !swapBuffers(mEGLSurface)) {
Log.e("JS", "GLContext: Cannot swap buffers!")
}
canvasView.invalidateState = TNSCanvas.InvalidateState.NONE
canvasView.invalidateState = canvasView.invalidateState and TNSCanvas.INVALIDATE_STATE_INVALIDATING.inv()
} else {
// WebGL
if (!mGLThread!!.getPaused() && !swapBuffers(mEGLSurface)) {
Log.e("JS", "GLContext: Cannot swap buffers!")
}
if (canvasView != null) {
canvasView.invalidateState = TNSCanvas.InvalidateState.NONE
// If this point is reached, it means something went wrong so set flag to none
canvasView.invalidateState = TNSCanvas.INVALIDATE_STATE_NONE
}
}
}
Expand Down
16 changes: 9 additions & 7 deletions ...anvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvas.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
}

@JvmField
internal var invalidateState = InvalidateState.NONE
internal var invalidateState = TNSCanvas.INVALIDATE_STATE_NONE // bitwise flag
internal var contextType = ContextType.NONE
internal var actualContextType = ""
internal var useCpu = false
Expand Down Expand Up @@ -122,14 +122,11 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {

private val mainHandler = Handler(Looper.getMainLooper())

enum class InvalidateState {
NONE, PENDING, INVALIDATING
}

override fun doFrame(frameTimeNanos: Long) {
if (!isHandleInvalidationManually) {
if (invalidateState == InvalidateState.PENDING) {
invalidateState = InvalidateState.INVALIDATING
// Only pending state flag is accepted
if (invalidateState == INVALIDATE_STATE_PENDING) {
invalidateState = INVALIDATE_STATE_INVALIDATING
flush()
}
}
Expand Down Expand Up @@ -600,6 +597,11 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
companion object {
var views: ConcurrentHashMap<*, *> = ConcurrentHashMap<Any?, Any?>()

// Invalidate state bitwise flags
internal const val INVALIDATE_STATE_NONE = 0
internal const val INVALIDATE_STATE_PENDING = 1
internal const val INVALIDATE_STATE_INVALIDATING = 2

@JvmStatic
fun layoutView(width: Int, height: Int, tnsCanvas: TNSCanvas) {
var rootParams = tnsCanvas.layoutParams
Expand Down
2 changes: 1 addition & 1 deletion ...anvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvasRenderingContext2D.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ class TNSCanvasRenderingContext2D internal constructor(val canvas: TNSCanvas) :

private fun updateCanvas() {
// synchronized (canvasView.lock) {
canvas.invalidateState = TNSCanvas.InvalidateState.PENDING
canvas.invalidateState = canvas.invalidateState or TNSCanvas.INVALIDATE_STATE_PENDING
//}
}

Expand Down
2 changes: 1 addition & 1 deletion ...e/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSWebGLRenderingContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ open class TNSWebGLRenderingContext : TNSCanvasRenderingContext {

fun updateCanvas() {
// synchronized (canvasView.lock) {
canvas.invalidateState = TNSCanvas.InvalidateState.PENDING
canvas.invalidateState = canvas.invalidateState or TNSCanvas.INVALIDATE_STATE_PENDING
//}
}

Expand Down