am 5510d172: am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
* commit '5510d1722b8da4fd630a236f0fd3aad0cc4dac0c':
cleanup headers for SDK. bug 3421901
diff --git a/java/Samples/src/com/android/samples/rsbench.rs b/java/Samples/src/com/android/samples/rsbench.rs
index 905f34b..a1368e6 100644
--- a/java/Samples/src/com/android/samples/rsbench.rs
+++ b/java/Samples/src/com/android/samples/rsbench.rs
@@ -297,7 +297,7 @@
if (buffer == 0) {
rsgProgramVertexLoadModelMatrix(matrix);
} else {
- rsAllocationMarkDirty(rsGetAllocation(buffer));
+ rsgAllocationSyncAll(rsGetAllocation(buffer));
}
}
@@ -409,7 +409,7 @@
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 @@
// 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 @@
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/java/Samples/src/com/android/samples/rsrenderstates.rs b/java/Samples/src/com/android/samples/rsrenderstates.rs
index 42be4d8..9019533 100644
--- a/java/Samples/src/com/android/samples/rsrenderstates.rs
+++ b/java/Samples/src/com/android/samples/rsrenderstates.rs
@@ -526,7 +526,7 @@
// 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);