Check-in [8e7b012cfe]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Name conflict solved
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8e7b012cfe663a68d33dc17b6ac5d41f3f3b472c
User & Date: bernd 2014-01-19 13:50:03
Context
2014-01-19
22:49
Recreate player for different movies to get correct texture size check-in: 137419d299 user: bernd tags: trunk
13:50
Name conflict solved check-in: 8e7b012cfe user: bernd tags: trunk
2014-01-18
23:27
Native activity replacement continues check-in: 95ff35491e user: bernd tags: trunk
Changes

Changes to gles2/android.fs.

49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
    field: x8
    field: y8
    field: x9
    field: y9
    end-structure

    begin-structure startargs
    field: vm
    field: env
    field: obj
    field: cls
    field: thread-id
    field: ke-fd0
    field: ke-fd1
    field: window \ native window
    end-structure







|
|







49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
    field: x8
    field: y8
    field: x9
    field: y9
    end-structure

    begin-structure startargs
    field: app-vm
    field: app-env
    field: obj
    field: cls
    field: thread-id
    field: ke-fd0
    field: ke-fd1
    field: window \ native window
    end-structure

Changes to gles2/jni-tools.fs.

7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

JavaVMAttachArgs buffer: vmAA

JNI_VERSION_1_6        vmAA JavaVMAttachArgs-version !
"NativeThread\0" drop  vmAA JavaVMAttachArgs-name !
0                      vmAA JavaVMAttachArgs-group !

app vm @ value vm
app env @ value env

16 Constant maxargs#

User callargs

: attach ( -- ) \ jni
    \G attach the current thread to the JVM







|
|







7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

JavaVMAttachArgs buffer: vmAA

JNI_VERSION_1_6        vmAA JavaVMAttachArgs-version !
"NativeThread\0" drop  vmAA JavaVMAttachArgs-name !
0                      vmAA JavaVMAttachArgs-group !

app app-vm @ value vm
app app-env @ value env

16 Constant maxargs#

User callargs

: attach ( -- ) \ jni
    \G attach the current thread to the JVM