Merge "Added a way to trigger an interpolated rotation of the carousel"
diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs
index 807c101..772e775 100644
--- a/carousel/java/com/android/ex/carousel/carousel.rs
+++ b/carousel/java/com/android/ex/carousel/carousel.rs
@@ -695,7 +695,7 @@
// Set alpha for blending between the textures
shaderConstants->fadeAmount = min(1.0f, animatedAlpha * positionAlpha);
shaderConstants->overallAlpha = overallAlpha;
- rsAllocationMarkDirty(rsGetAllocation(shaderConstants));
+ rsgAllocationSyncAll(rsGetAllocation(shaderConstants));
// Bind the appropriate shader network. If there's no alpha blend, then
// switch to single shader for better performance.
@@ -894,7 +894,7 @@
// Set alpha for blending between the textures
shaderConstants->fadeAmount = blendedAlpha;
- rsAllocationMarkDirty(rsGetAllocation(shaderConstants));
+ rsgAllocationSyncAll(rsGetAllocation(shaderConstants));
// Draw line from the card to the detail texture.
// The line is drawn from the top or bottom left of the card
@@ -1720,7 +1720,8 @@
const float w = rsgGetWidth();
const float h = rsgGetHeight();
const int skip = 8;
- color(1.0f, 0.0f, 0.0f, 1.0f);
+
+ rsgProgramFragmentConstantColor(singleTextureFragmentProgram, 1.0f, 0.0f, 0.0f, 1.0f);
for (int j = 0; j < (int) h; j+=skip) {
float posY = (float) j;
for (int i = 0; i < (int) w; i+=skip) {