commit f603d212552485c634e25f3556f847dc2b022bd5
author Jason Sams <rjsams@android.com> Fri May 14 15:30:29 2010 -0700
committer Jason Sams <rjsams@android.com> Fri May 14 15:30:29 2010 -0700
tree a2112e01bd2f7d72465717a153216a6d8b6e63f4
parent 54db59c3594e887a412a24713fc3daa1c2404593

Change RS to use the passed surface size rather than EGL size.
Its possible that during a resize the EGL information could be stale so
caching this is bad.  The surface size should always be correct.

Change-Id: Ifd479e1ea70b1cada1a8690c7c82e91aa391b685

Conflicts:

	libs/rs/rsProgramStore.cpp
	libs/rs/rsProgramStore.h

libs/rs/rsProgramVertex.cpp

diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp
index a2b2df4..c3264aed 100644
--- a/libs/rs/rsProgramVertex.cpp
+++ b/libs/rs/rsProgramVertex.cpp
@@ -362,7 +362,7 @@
 {
 }
 
-void ProgramVertexState::init(Context *rsc, int32_t w, int32_t h)
+void ProgramVertexState::init(Context *rsc)
 {
     RsElement e = (RsElement) Element::create(rsc, RS_TYPE_FLOAT_32, RS_KIND_USER, false, 1);
 
@@ -382,13 +382,13 @@
     color[2] = 1.f;
     color[3] = 1.f;
 
-    updateSize(rsc, w, h);
+    updateSize(rsc);
 }
 
-void ProgramVertexState::updateSize(Context *rsc, int32_t w, int32_t h)
+void ProgramVertexState::updateSize(Context *rsc)
 {
     Matrix m;
-    m.loadOrtho(0,w, h,0, -1,1);
+    m.loadOrtho(0,rsc->getWidth(), rsc->getHeight(),0, -1,1);
     mDefaultAlloc->subData(RS_PROGRAM_VERTEX_PROJECTION_OFFSET, 16, &m.m[0], 16*4);
 
     m.loadIdentity();