diff options
| author | Stephen Hines <srhines@google.com> | 2010-10-08 15:33:25 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2010-10-08 15:33:25 -0700 |
| commit | b06b5d3798e2668b8b5660da625c13c743daf469 (patch) | |
| tree | de036810bf5332891f4d1b2a2b1826c142a6a1c7 /carousel | |
| parent | d7fa647e6fa4e832381be5bdd03065f9ea35c3f1 (diff) | |
| download | android_frameworks_ex-b06b5d3798e2668b8b5660da625c13c743daf469.tar.gz android_frameworks_ex-b06b5d3798e2668b8b5660da625c13c743daf469.tar.bz2 android_frameworks_ex-b06b5d3798e2668b8b5660da625c13c743daf469.zip | |
Remove now unnecessary pragma rs export_var().
Change-Id: I8b5ecb9959d1ca506621e9f7228f3b9cd8698278
Diffstat (limited to 'carousel')
| -rw-r--r-- | carousel/java/com/android/ex/carousel/carousel.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs index 0f0cbb4..551795b 100644 --- a/carousel/java/com/android/ex/carousel/carousel.rs +++ b/carousel/java/com/android/ex/carousel/carousel.rs @@ -127,15 +127,6 @@ rs_matrix4x4 modelviewMatrix; FragmentShaderConstants* shaderConstants; rs_sampler linearClamp; -#pragma rs export_var(radius, cards, tmpCards, slotCount, visibleSlotCount, cardRotation, backgroundColor) -#pragma rs export_var(cardsFaceTangent, swaySensitivity, frictionCoeff, dragFactor) -#pragma rs export_var(visibleDetailCount, drawDetailBelowCard, drawRuler) -#pragma rs export_var(programStore, vertexProgram, rasterProgram) -#pragma rs export_var(singleTextureFragmentProgram, multiTextureFragmentProgram) -#pragma rs export_var(detailLineTexture, detailLoadingTexture, backgroundTexture) -#pragma rs export_var(linearClamp, shaderConstants) -#pragma rs export_var(startAngle, defaultTexture, loadingTexture, defaultGeometry, loadingGeometry) -#pragma rs export_var(fadeInDuration, rezInCardCount) #pragma rs export_func(createCards, copyCards, lookAt) #pragma rs export_func(doStart, doStop, doMotion, doLongPress, doSelection) #pragma rs export_func(setTexture, setGeometry, setDetailTexture, debugCamera, debugPicking) @@ -145,7 +136,7 @@ rs_sampler linearClamp; static float bias; // rotation bias, in radians. Used for animation and dragging. static bool updateCamera; // force a recompute of projection and lookat matrices static bool initialized; -static float4 backgroundColor; +float4 backgroundColor; static const float FLT_MAX = 1.0e37; static int currentSelection = -1; static int currentFirstCard = -1; |
