diff options
author | Jason Sams <rjsams@android.com> | 2011-02-07 13:59:45 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-07 13:59:45 -0800 |
commit | f8cbf7297bd7e29867154610cbc24fe0dbc168d1 (patch) | |
tree | c6bfd64a354db91754f7d712d7f1d0655f5e3af0 /libs/rs | |
parent | 4dd2299d5766bf14479578772a0946c5399a0158 (diff) | |
parent | 5f1d68dcd27649d6370f08e1856cb52d3c15ef68 (diff) | |
download | frameworks_base-f8cbf7297bd7e29867154610cbc24fe0dbc168d1.zip frameworks_base-f8cbf7297bd7e29867154610cbc24fe0dbc168d1.tar.gz frameworks_base-f8cbf7297bd7e29867154610cbc24fe0dbc168d1.tar.bz2 |
Merge "cleanup headers for SDK. bug 3421901" into honeycomb
Diffstat (limited to 'libs/rs')
-rw-r--r-- | libs/rs/java/Samples/src/com/android/samples/rsbench.rs | 8 | ||||
-rw-r--r-- | libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/rs/java/Samples/src/com/android/samples/rsbench.rs b/libs/rs/java/Samples/src/com/android/samples/rsbench.rs index 905f34b..a1368e6 100644 --- a/libs/rs/java/Samples/src/com/android/samples/rsbench.rs +++ b/libs/rs/java/Samples/src/com/android/samples/rsbench.rs @@ -297,7 +297,7 @@ static void updateModelMatrix(rs_matrix4x4 *matrix, void *buffer) { if (buffer == 0) { rsgProgramVertexLoadModelMatrix(matrix); } else { - rsAllocationMarkDirty(rsGetAllocation(buffer)); + rsgAllocationSyncAll(rsGetAllocation(buffer)); } } @@ -409,7 +409,7 @@ static void setupCustomShaderLights() { gVSConstants->light1_Diffuse = 1.0f; gVSConstants->light1_Specular = 0.7f; gVSConstants->light1_CosinePower = 25.0f; - rsAllocationMarkDirty(rsGetAllocation(gVSConstants)); + rsgAllocationSyncAll(rsGetAllocation(gVSConstants)); // Update fragment shader constants // Set light 0 colors @@ -418,7 +418,7 @@ static void setupCustomShaderLights() { // Set light 1 colors gFSConstants->light1_DiffuseColor = light1DiffCol; gFSConstants->light1_SpecularColor = light1SpecCol; - rsAllocationMarkDirty(rsGetAllocation(gFSConstants)); + rsgAllocationSyncAll(rsGetAllocation(gFSConstants)); // Set light 0 properties for per pixel lighting gFSConstPixel->light0_Posision = light0Pos; @@ -434,7 +434,7 @@ static void setupCustomShaderLights() { gFSConstPixel->light1_CosinePower = 25.0f; gFSConstPixel->light1_DiffuseColor = light1DiffCol; gFSConstPixel->light1_SpecularColor = light1SpecCol; - rsAllocationMarkDirty(rsGetAllocation(gFSConstPixel)); + rsgAllocationSyncAll(rsGetAllocation(gFSConstPixel)); } static void displayCustomShaderSamples(int numMeshes) { diff --git a/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs b/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs index 42be4d8..9019533 100644 --- a/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs +++ b/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs @@ -526,7 +526,7 @@ static void displayCubemapShaderSample() { // Setup the projectioni matrix float aspect = (float)rsgGetWidth() / (float)rsgGetHeight(); rsMatrixLoadPerspective(&gVSConstants->proj, 30.0f, aspect, 0.1f, 100.0f); - rsAllocationMarkDirty(rsGetAllocation(gFSConstants)); + rsgAllocationSyncAll(rsGetAllocation(gFSConstants)); rsgBindProgramVertex(gProgVertexCube); |