summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-06-16 12:38:55 -0700
committerMathias Agopian <mathias@google.com>2009-06-16 12:38:55 -0700
commit69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584 (patch)
tree3a8bc941200fa85a32a21657ac69ec9beb9a6463 /libs/rs/rsScript.cpp
parent151e859e0fc3a930bdf6d270d275e69e9eba0cbf (diff)
parentb0b160ae50497966666bcdcaf974eca2643acfd3 (diff)
downloadframeworks_base-69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584.zip
frameworks_base-69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584.tar.gz
frameworks_base-69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584.tar.bz2
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'libs/rs/rsScript.cpp')
-rw-r--r--libs/rs/rsScript.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/libs/rs/rsScript.cpp b/libs/rs/rsScript.cpp
index 24a630c..ae85c9c 100644
--- a/libs/rs/rsScript.cpp
+++ b/libs/rs/rsScript.cpp
@@ -21,11 +21,12 @@ using namespace android::renderscript;
Script::Script()
{
- mClearColor[0] = 0;
- mClearColor[1] = 0;
- mClearColor[2] = 0;
- mClearColor[3] = 1;
- mClearDepth = 1;
+ memset(&mEnviroment, 0, sizeof(mEnviroment));
+ mEnviroment.mClearColor[0] = 0;
+ mEnviroment.mClearColor[1] = 0;
+ mEnviroment.mClearColor[2] = 0;
+ mEnviroment.mClearColor[3] = 1;
+ mEnviroment.mClearDepth = 1;
}
Script::~Script()