Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb

Browse Source 
* commit 'f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
  cleanup headers for SDK. bug 3421901
This commit is contained in:
Jason Sams
2011-02-07 14:17:45 -08:00
committed by Android Git Automerger
parent 5ac5388359 f8cbf7297b
commit 5510d1722b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/rs/java/Samples/src/com/android/samples/rsbench.rs
View File

@@ -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) {

2
libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs
View File

@@ -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);