blob: 5475041180016254189e2d4b638f913ef1899cf9 [file] [log] [blame]
Jason Samseb4fe182011-05-26 16:33:01 -07001/*
Jason Sams3522f402012-03-23 11:47:26 -07002 * Copyright (C) 2011-2012 The Android Open Source Project
Jason Samseb4fe182011-05-26 16:33:01 -07003 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17
18#include "rsdCore.h"
Jason Samseb4fe182011-05-26 16:33:01 -070019#include "rsdRuntime.h"
20#include "rsdAllocation.h"
Alex Sakhartchouka9495242011-06-16 11:05:13 -070021#include "rsdFrameBufferObj.h"
Jason Samseb4fe182011-05-26 16:33:01 -070022
23#include "rsAllocation.h"
24
Jason Sams7ac2a4d2012-02-15 12:04:24 -080025#include "system/window.h"
26#include "hardware/gralloc.h"
27#include "ui/Rect.h"
28#include "ui/GraphicBufferMapper.h"
Jason Sams3522f402012-03-23 11:47:26 -070029#include "gui/SurfaceTexture.h"
Jason Sams7ac2a4d2012-02-15 12:04:24 -080030
Jason Samseb4fe182011-05-26 16:33:01 -070031#include <GLES/gl.h>
32#include <GLES2/gl2.h>
33#include <GLES/glext.h>
34
35using namespace android;
36using namespace android::renderscript;
37
38
39
40const static GLenum gFaceOrder[] = {
41 GL_TEXTURE_CUBE_MAP_POSITIVE_X,
42 GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
43 GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
44 GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
45 GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
46 GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
47};
48
49
Jason Samsa614ae12011-05-26 17:05:51 -070050GLenum rsdTypeToGLType(RsDataType t) {
51 switch (t) {
52 case RS_TYPE_UNSIGNED_5_6_5: return GL_UNSIGNED_SHORT_5_6_5;
53 case RS_TYPE_UNSIGNED_5_5_5_1: return GL_UNSIGNED_SHORT_5_5_5_1;
54 case RS_TYPE_UNSIGNED_4_4_4_4: return GL_UNSIGNED_SHORT_4_4_4_4;
55
56 //case RS_TYPE_FLOAT_16: return GL_HALF_FLOAT;
57 case RS_TYPE_FLOAT_32: return GL_FLOAT;
58 case RS_TYPE_UNSIGNED_8: return GL_UNSIGNED_BYTE;
59 case RS_TYPE_UNSIGNED_16: return GL_UNSIGNED_SHORT;
60 case RS_TYPE_SIGNED_8: return GL_BYTE;
61 case RS_TYPE_SIGNED_16: return GL_SHORT;
62 default: break;
63 }
64 return 0;
65}
66
67GLenum rsdKindToGLFormat(RsDataKind k) {
68 switch (k) {
69 case RS_KIND_PIXEL_L: return GL_LUMINANCE;
70 case RS_KIND_PIXEL_A: return GL_ALPHA;
71 case RS_KIND_PIXEL_LA: return GL_LUMINANCE_ALPHA;
72 case RS_KIND_PIXEL_RGB: return GL_RGB;
73 case RS_KIND_PIXEL_RGBA: return GL_RGBA;
74 case RS_KIND_PIXEL_DEPTH: return GL_DEPTH_COMPONENT16;
75 default: break;
76 }
77 return 0;
78}
79
Jason Sams807fdc42012-07-25 17:55:39 -070080uint8_t *GetOffsetPtr(const android::renderscript::Allocation *alloc,
81 uint32_t xoff, uint32_t yoff, uint32_t lod,
82 RsAllocationCubemapFace face) {
83 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
84 uint8_t *ptr = (uint8_t *)drv->lod[lod].mallocPtr;
85 ptr += face * drv->faceOffset;
86 ptr += yoff * drv->lod[lod].stride;
87 ptr += xoff * alloc->mHal.state.elementSizeBytes;
88 return ptr;
89}
90
Jason Samsa614ae12011-05-26 17:05:51 -070091
Jason Sams2382aba2011-09-13 15:41:01 -070092static void Update2DTexture(const Context *rsc, const Allocation *alloc, const void *ptr,
93 uint32_t xoff, uint32_t yoff, uint32_t lod,
94 RsAllocationCubemapFace face, uint32_t w, uint32_t h) {
Jason Samseb4fe182011-05-26 16:33:01 -070095 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
96
Jason Samseb4fe182011-05-26 16:33:01 -070097 rsAssert(drv->textureID);
Jason Sams2382aba2011-09-13 15:41:01 -070098 RSD_CALL_GL(glBindTexture, drv->glTarget, drv->textureID);
99 RSD_CALL_GL(glPixelStorei, GL_UNPACK_ALIGNMENT, 1);
Jason Samseb4fe182011-05-26 16:33:01 -0700100 GLenum t = GL_TEXTURE_2D;
101 if (alloc->mHal.state.hasFaces) {
102 t = gFaceOrder[face];
103 }
Jason Sams2382aba2011-09-13 15:41:01 -0700104 RSD_CALL_GL(glTexSubImage2D, t, lod, xoff, yoff, w, h, drv->glFormat, drv->glType, ptr);
Jason Samseb4fe182011-05-26 16:33:01 -0700105}
106
107
108static void Upload2DTexture(const Context *rsc, const Allocation *alloc, bool isFirstUpload) {
109 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
110
Jason Sams2382aba2011-09-13 15:41:01 -0700111 RSD_CALL_GL(glBindTexture, drv->glTarget, drv->textureID);
112 RSD_CALL_GL(glPixelStorei, GL_UNPACK_ALIGNMENT, 1);
Jason Samseb4fe182011-05-26 16:33:01 -0700113
114 uint32_t faceCount = 1;
115 if (alloc->mHal.state.hasFaces) {
116 faceCount = 6;
117 }
118
119 rsdGLCheckError(rsc, "Upload2DTexture 1 ");
120 for (uint32_t face = 0; face < faceCount; face ++) {
121 for (uint32_t lod = 0; lod < alloc->mHal.state.type->getLODCount(); lod++) {
Jason Sams807fdc42012-07-25 17:55:39 -0700122 const uint8_t *p = GetOffsetPtr(alloc, 0, 0, lod, (RsAllocationCubemapFace)face);
Jason Samseb4fe182011-05-26 16:33:01 -0700123
124 GLenum t = GL_TEXTURE_2D;
125 if (alloc->mHal.state.hasFaces) {
126 t = gFaceOrder[face];
127 }
128
129 if (isFirstUpload) {
Jason Sams2382aba2011-09-13 15:41:01 -0700130 RSD_CALL_GL(glTexImage2D, t, lod, drv->glFormat,
Jason Samseb4fe182011-05-26 16:33:01 -0700131 alloc->mHal.state.type->getLODDimX(lod),
132 alloc->mHal.state.type->getLODDimY(lod),
Jason Samsa614ae12011-05-26 17:05:51 -0700133 0, drv->glFormat, drv->glType, p);
Jason Samseb4fe182011-05-26 16:33:01 -0700134 } else {
Jason Sams2382aba2011-09-13 15:41:01 -0700135 RSD_CALL_GL(glTexSubImage2D, t, lod, 0, 0,
Jason Samseb4fe182011-05-26 16:33:01 -0700136 alloc->mHal.state.type->getLODDimX(lod),
137 alloc->mHal.state.type->getLODDimY(lod),
Jason Samsa614ae12011-05-26 17:05:51 -0700138 drv->glFormat, drv->glType, p);
Jason Samseb4fe182011-05-26 16:33:01 -0700139 }
140 }
141 }
142
143 if (alloc->mHal.state.mipmapControl == RS_ALLOCATION_MIPMAP_ON_SYNC_TO_TEXTURE) {
Jason Sams2382aba2011-09-13 15:41:01 -0700144 RSD_CALL_GL(glGenerateMipmap, drv->glTarget);
Jason Samseb4fe182011-05-26 16:33:01 -0700145 }
146 rsdGLCheckError(rsc, "Upload2DTexture");
147}
148
149static void UploadToTexture(const Context *rsc, const Allocation *alloc) {
150 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
151
Jason Sams3522f402012-03-23 11:47:26 -0700152 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_IO_INPUT) {
Jason Sams41e373d2012-01-13 14:01:20 -0800153 if (!drv->textureID) {
154 RSD_CALL_GL(glGenTextures, 1, &drv->textureID);
155 }
156 return;
157 }
158
Jason Samsa614ae12011-05-26 17:05:51 -0700159 if (!drv->glType || !drv->glFormat) {
Jason Samseb4fe182011-05-26 16:33:01 -0700160 return;
161 }
162
Jason Sams61a4bb72012-07-25 19:33:43 -0700163 if (!drv->lod[0].mallocPtr) {
Jason Samseb4fe182011-05-26 16:33:01 -0700164 return;
165 }
166
167 bool isFirstUpload = false;
168
169 if (!drv->textureID) {
Jason Sams2382aba2011-09-13 15:41:01 -0700170 RSD_CALL_GL(glGenTextures, 1, &drv->textureID);
Jason Samseb4fe182011-05-26 16:33:01 -0700171 isFirstUpload = true;
172 }
173
174 Upload2DTexture(rsc, alloc, isFirstUpload);
175
176 if (!(alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_SCRIPT)) {
Jason Sams807fdc42012-07-25 17:55:39 -0700177 if (alloc->mHal.drvState.mallocPtrLOD0) {
178 free(alloc->mHal.drvState.mallocPtrLOD0);
179 alloc->mHal.drvState.mallocPtrLOD0 = NULL;
180 drv->lod[0].mallocPtr = NULL;
Jason Samseb4fe182011-05-26 16:33:01 -0700181 }
182 }
183 rsdGLCheckError(rsc, "UploadToTexture");
184}
185
186static void AllocateRenderTarget(const Context *rsc, const Allocation *alloc) {
187 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
188
Jason Samsa614ae12011-05-26 17:05:51 -0700189 if (!drv->glFormat) {
Jason Samseb4fe182011-05-26 16:33:01 -0700190 return;
191 }
192
193 if (!drv->renderTargetID) {
Jason Sams2382aba2011-09-13 15:41:01 -0700194 RSD_CALL_GL(glGenRenderbuffers, 1, &drv->renderTargetID);
Jason Samseb4fe182011-05-26 16:33:01 -0700195
196 if (!drv->renderTargetID) {
197 // This should generally not happen
Steve Blockaf12ac62012-01-06 19:20:56 +0000198 ALOGE("allocateRenderTarget failed to gen mRenderTargetID");
Jason Samseb4fe182011-05-26 16:33:01 -0700199 rsc->dumpDebug();
200 return;
201 }
Jason Sams2382aba2011-09-13 15:41:01 -0700202 RSD_CALL_GL(glBindRenderbuffer, GL_RENDERBUFFER, drv->renderTargetID);
203 RSD_CALL_GL(glRenderbufferStorage, GL_RENDERBUFFER, drv->glFormat,
Jason Samseb4fe182011-05-26 16:33:01 -0700204 alloc->mHal.state.dimensionX, alloc->mHal.state.dimensionY);
205 }
206 rsdGLCheckError(rsc, "AllocateRenderTarget");
207}
208
209static void UploadToBufferObject(const Context *rsc, const Allocation *alloc) {
210 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
211
212 rsAssert(!alloc->mHal.state.type->getDimY());
213 rsAssert(!alloc->mHal.state.type->getDimZ());
214
215 //alloc->mHal.state.usageFlags |= RS_ALLOCATION_USAGE_GRAPHICS_VERTEX;
216
217 if (!drv->bufferID) {
Jason Sams2382aba2011-09-13 15:41:01 -0700218 RSD_CALL_GL(glGenBuffers, 1, &drv->bufferID);
Jason Samseb4fe182011-05-26 16:33:01 -0700219 }
220 if (!drv->bufferID) {
Steve Blockaf12ac62012-01-06 19:20:56 +0000221 ALOGE("Upload to buffer object failed");
Jason Samseb4fe182011-05-26 16:33:01 -0700222 drv->uploadDeferred = true;
223 return;
224 }
Jason Sams2382aba2011-09-13 15:41:01 -0700225 RSD_CALL_GL(glBindBuffer, drv->glTarget, drv->bufferID);
226 RSD_CALL_GL(glBufferData, drv->glTarget, alloc->mHal.state.type->getSizeBytes(),
Jason Sams807fdc42012-07-25 17:55:39 -0700227 alloc->mHal.drvState.mallocPtrLOD0, GL_DYNAMIC_DRAW);
Jason Sams2382aba2011-09-13 15:41:01 -0700228 RSD_CALL_GL(glBindBuffer, drv->glTarget, 0);
Jason Samseb4fe182011-05-26 16:33:01 -0700229 rsdGLCheckError(rsc, "UploadToBufferObject");
230}
231
Jason Sams463bfce2012-08-21 13:54:42 -0700232static size_t AllocationBuildPointerTable(const Context *rsc, const Allocation *alloc,
233 const Type *type, uint8_t *ptr) {
Jason Samseb4fe182011-05-26 16:33:01 -0700234
Jason Sams463bfce2012-08-21 13:54:42 -0700235 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
236
237 drv->lod[0].dimX = type->getDimX();
238 drv->lod[0].dimY = type->getDimY();
Jason Sams807fdc42012-07-25 17:55:39 -0700239 drv->lod[0].mallocPtr = 0;
Jason Sams463bfce2012-08-21 13:54:42 -0700240 drv->lod[0].stride = drv->lod[0].dimX * type->getElementSizeBytes();
241 drv->lodCount = type->getLODCount();
242 drv->faceCount = type->getDimFaces();
Jason Sams807fdc42012-07-25 17:55:39 -0700243
244 size_t offsets[Allocation::MAX_LOD];
245 memset(offsets, 0, sizeof(offsets));
246
247 size_t o = drv->lod[0].stride * rsMax(drv->lod[0].dimY, 1u) * rsMax(drv->lod[0].dimZ, 1u);
248 if(drv->lodCount > 1) {
249 uint32_t tx = drv->lod[0].dimX;
250 uint32_t ty = drv->lod[0].dimY;
251 uint32_t tz = drv->lod[0].dimZ;
252 for (uint32_t lod=1; lod < drv->lodCount; lod++) {
253 drv->lod[lod].dimX = tx;
254 drv->lod[lod].dimY = ty;
255 drv->lod[lod].dimZ = tz;
Jason Sams463bfce2012-08-21 13:54:42 -0700256 drv->lod[lod].stride = tx * type->getElementSizeBytes();
Jason Sams807fdc42012-07-25 17:55:39 -0700257 offsets[lod] = o;
258 o += drv->lod[lod].stride * rsMax(ty, 1u) * rsMax(tz, 1u);
259 if (tx > 1) tx >>= 1;
260 if (ty > 1) ty >>= 1;
261 if (tz > 1) tz >>= 1;
262 }
263 }
264 drv->faceOffset = o;
265
Jason Sams463bfce2012-08-21 13:54:42 -0700266 drv->lod[0].mallocPtr = ptr;
267 for (uint32_t lod=1; lod < drv->lodCount; lod++) {
268 drv->lod[lod].mallocPtr = ptr + offsets[lod];
269 }
270 alloc->mHal.drvState.strideLOD0 = drv->lod[0].stride;
271 alloc->mHal.drvState.mallocPtrLOD0 = ptr;
272
273 size_t allocSize = drv->faceOffset;
274 if(drv->faceCount) {
275 allocSize *= 6;
276 }
277
278 return allocSize;
279}
280
281bool rsdAllocationInit(const Context *rsc, Allocation *alloc, bool forceZero) {
282 DrvAllocation *drv = (DrvAllocation *)calloc(1, sizeof(DrvAllocation));
283 if (!drv) {
284 return false;
285 }
286 alloc->mHal.drv = drv;
287
288 // Calculate the object size.
289 size_t allocSize = AllocationBuildPointerTable(rsc, alloc, alloc->getType(), NULL);
290
Jason Sams807fdc42012-07-25 17:55:39 -0700291 uint8_t * ptr = NULL;
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800292 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_IO_OUTPUT) {
293 } else {
Jason Sams807fdc42012-07-25 17:55:39 -0700294
295 ptr = (uint8_t *)malloc(allocSize);
Jason Sams179e9a42011-11-23 15:02:15 -0800296 if (!ptr) {
You Kimed419f32012-12-17 03:42:57 +0900297 alloc->mHal.drv = NULL;
Jason Sams179e9a42011-11-23 15:02:15 -0800298 free(drv);
299 return false;
300 }
Jason Samseb4fe182011-05-26 16:33:01 -0700301 }
Jason Sams463bfce2012-08-21 13:54:42 -0700302 // Build the pointer tables
303 size_t verifySize = AllocationBuildPointerTable(rsc, alloc, alloc->getType(), ptr);
304 if(allocSize != verifySize) {
305 rsAssert(!"Size mismatch");
Jason Sams807fdc42012-07-25 17:55:39 -0700306 }
Jason Samseb4fe182011-05-26 16:33:01 -0700307
308 drv->glTarget = GL_NONE;
309 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_TEXTURE) {
310 if (alloc->mHal.state.hasFaces) {
311 drv->glTarget = GL_TEXTURE_CUBE_MAP;
312 } else {
313 drv->glTarget = GL_TEXTURE_2D;
314 }
315 } else {
316 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_VERTEX) {
317 drv->glTarget = GL_ARRAY_BUFFER;
318 }
319 }
320
Jason Samsa614ae12011-05-26 17:05:51 -0700321 drv->glType = rsdTypeToGLType(alloc->mHal.state.type->getElement()->getComponent().getType());
322 drv->glFormat = rsdKindToGLFormat(alloc->mHal.state.type->getElement()->getComponent().getKind());
323
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800324 if (forceZero && ptr) {
Jason Samseb4fe182011-05-26 16:33:01 -0700325 memset(ptr, 0, alloc->mHal.state.type->getSizeBytes());
326 }
327
328 if (alloc->mHal.state.usageFlags & ~RS_ALLOCATION_USAGE_SCRIPT) {
329 drv->uploadDeferred = true;
330 }
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700331
Jason Samsb3220332012-04-02 14:41:54 -0700332
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700333 drv->readBackFBO = NULL;
334
Jason Samseb4fe182011-05-26 16:33:01 -0700335 return true;
336}
337
338void rsdAllocationDestroy(const Context *rsc, Allocation *alloc) {
339 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
340
341 if (drv->bufferID) {
342 // Causes a SW crash....
Steve Block65982012011-10-20 11:56:00 +0100343 //ALOGV(" mBufferID %i", mBufferID);
Jason Samseb4fe182011-05-26 16:33:01 -0700344 //glDeleteBuffers(1, &mBufferID);
345 //mBufferID = 0;
346 }
347 if (drv->textureID) {
Jason Sams2382aba2011-09-13 15:41:01 -0700348 RSD_CALL_GL(glDeleteTextures, 1, &drv->textureID);
Jason Samseb4fe182011-05-26 16:33:01 -0700349 drv->textureID = 0;
350 }
351 if (drv->renderTargetID) {
Jason Sams2382aba2011-09-13 15:41:01 -0700352 RSD_CALL_GL(glDeleteRenderbuffers, 1, &drv->renderTargetID);
Jason Samseb4fe182011-05-26 16:33:01 -0700353 drv->renderTargetID = 0;
354 }
355
Jason Sams807fdc42012-07-25 17:55:39 -0700356 if (alloc->mHal.drvState.mallocPtrLOD0) {
357 free(alloc->mHal.drvState.mallocPtrLOD0);
358 alloc->mHal.drvState.mallocPtrLOD0 = NULL;
Jason Samseb4fe182011-05-26 16:33:01 -0700359 }
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700360 if (drv->readBackFBO != NULL) {
361 delete drv->readBackFBO;
362 drv->readBackFBO = NULL;
363 }
Jason Samseb4fe182011-05-26 16:33:01 -0700364 free(drv);
365 alloc->mHal.drv = NULL;
366}
367
368void rsdAllocationResize(const Context *rsc, const Allocation *alloc,
369 const Type *newType, bool zeroNew) {
370 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
371
Jason Sams463bfce2012-08-21 13:54:42 -0700372 void * oldPtr = drv->lod[0].mallocPtr;
373 // Calculate the object size
374 size_t s = AllocationBuildPointerTable(rsc, alloc, newType, NULL);
375 uint8_t *ptr = (uint8_t *)realloc(oldPtr, s);
376 // Build the relative pointer tables.
377 size_t verifySize = AllocationBuildPointerTable(rsc, alloc, newType, ptr);
378 if(s != verifySize) {
379 rsAssert(!"Size mismatch");
380 }
Jason Samseb4fe182011-05-26 16:33:01 -0700381
382 const uint32_t oldDimX = alloc->mHal.state.dimensionX;
383 const uint32_t dimX = newType->getDimX();
384
385 if (dimX > oldDimX) {
Jason Sams463bfce2012-08-21 13:54:42 -0700386 uint32_t stride = alloc->mHal.state.elementSizeBytes;
Jason Sams807fdc42012-07-25 17:55:39 -0700387 memset(((uint8_t *)alloc->mHal.drvState.mallocPtrLOD0) + stride * oldDimX,
Jason Sams2275e9c2012-04-16 17:01:26 -0700388 0, stride * (dimX - oldDimX));
Jason Samseb4fe182011-05-26 16:33:01 -0700389 }
390}
391
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700392static void rsdAllocationSyncFromFBO(const Context *rsc, const Allocation *alloc) {
393 if (!alloc->getIsScript()) {
394 return; // nothing to sync
395 }
396
397 RsdHal *dc = (RsdHal *)rsc->mHal.drv;
398 RsdFrameBufferObj *lastFbo = dc->gl.currentFrameBuffer;
399
400 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
401 if (!drv->textureID && !drv->renderTargetID) {
402 return; // nothing was rendered here yet, so nothing to sync
403 }
404 if (drv->readBackFBO == NULL) {
405 drv->readBackFBO = new RsdFrameBufferObj();
406 drv->readBackFBO->setColorTarget(drv, 0);
407 drv->readBackFBO->setDimensions(alloc->getType()->getDimX(),
408 alloc->getType()->getDimY());
409 }
410
411 // Bind the framebuffer object so we can read back from it
412 drv->readBackFBO->setActive(rsc);
413
414 // Do the readback
Jason Sams61a4bb72012-07-25 19:33:43 -0700415 RSD_CALL_GL(glReadPixels, 0, 0, drv->lod[0].dimX, drv->lod[0].dimY,
416 drv->glFormat, drv->glType, drv->lod[0].mallocPtr);
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700417
418 // Revert framebuffer to its original
419 lastFbo->setActive(rsc);
420}
Jason Samseb4fe182011-05-26 16:33:01 -0700421
422
423void rsdAllocationSyncAll(const Context *rsc, const Allocation *alloc,
424 RsAllocationUsageType src) {
425 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
426
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700427 if (src == RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET) {
428 if(!alloc->getIsRenderTarget()) {
429 rsc->setError(RS_ERROR_FATAL_DRIVER,
430 "Attempting to sync allocation from render target, "
431 "for non-render target allocation");
432 } else if (alloc->getType()->getElement()->getKind() != RS_KIND_PIXEL_RGBA) {
433 rsc->setError(RS_ERROR_FATAL_DRIVER, "Cannot only sync from RGBA"
434 "render target");
435 } else {
436 rsdAllocationSyncFromFBO(rsc, alloc);
437 }
Jason Samseb4fe182011-05-26 16:33:01 -0700438 return;
439 }
440
441 rsAssert(src == RS_ALLOCATION_USAGE_SCRIPT);
442
443 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_TEXTURE) {
444 UploadToTexture(rsc, alloc);
445 } else {
Jason Samsb3220332012-04-02 14:41:54 -0700446 if ((alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET) &&
Jason Sams0dc66932012-04-10 17:05:49 -0700447 !(alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_IO_OUTPUT)) {
Jason Samseb4fe182011-05-26 16:33:01 -0700448 AllocateRenderTarget(rsc, alloc);
449 }
450 }
451 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_VERTEX) {
452 UploadToBufferObject(rsc, alloc);
453 }
454
455 drv->uploadDeferred = false;
456}
457
458void rsdAllocationMarkDirty(const Context *rsc, const Allocation *alloc) {
459 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
460 drv->uploadDeferred = true;
461}
462
Jason Sams41e373d2012-01-13 14:01:20 -0800463int32_t rsdAllocationInitSurfaceTexture(const Context *rsc, const Allocation *alloc) {
464 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
465 UploadToTexture(rsc, alloc);
466 return drv->textureID;
467}
468
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800469static bool IoGetBuffer(const Context *rsc, Allocation *alloc, ANativeWindow *nw) {
470 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
471
Jamie Genniscd919a12012-06-13 16:34:11 -0700472 int32_t r = native_window_dequeue_buffer_and_wait(nw, &drv->wndBuffer);
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800473 if (r) {
474 rsc->setError(RS_ERROR_DRIVER, "Error getting next IO output buffer.");
475 return false;
476 }
477
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800478 // Must lock the whole surface
479 GraphicBufferMapper &mapper = GraphicBufferMapper::get();
480 Rect bounds(drv->wndBuffer->width, drv->wndBuffer->height);
481
482 void *dst = NULL;
483 mapper.lock(drv->wndBuffer->handle,
484 GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN,
485 bounds, &dst);
Jason Sams807fdc42012-07-25 17:55:39 -0700486 drv->lod[0].mallocPtr = dst;
487 alloc->mHal.drvState.mallocPtrLOD0 = dst;
488 drv->lod[0].stride = drv->wndBuffer->stride * alloc->mHal.state.elementSizeBytes;
Jason Samsb3220332012-04-02 14:41:54 -0700489
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800490 return true;
491}
492
493void rsdAllocationSetSurfaceTexture(const Context *rsc, Allocation *alloc, ANativeWindow *nw) {
494 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
495
496 //ALOGE("rsdAllocationSetSurfaceTexture %p %p", alloc, nw);
497
Jason Samsb3220332012-04-02 14:41:54 -0700498 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET) {
499 //TODO finish support for render target + script
500 drv->wnd = nw;
501 return;
502 }
503
504
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800505 // Cleanup old surface if there is one.
506 if (alloc->mHal.state.wndSurface) {
507 ANativeWindow *old = alloc->mHal.state.wndSurface;
508 GraphicBufferMapper &mapper = GraphicBufferMapper::get();
509 mapper.unlock(drv->wndBuffer->handle);
Jamie Genniscd919a12012-06-13 16:34:11 -0700510 old->queueBuffer(old, drv->wndBuffer, -1);
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800511 }
512
513 if (nw != NULL) {
514 int32_t r;
Jason Samsb3220332012-04-02 14:41:54 -0700515 uint32_t flags = 0;
516 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_SCRIPT) {
517 flags |= GRALLOC_USAGE_SW_READ_RARELY | GRALLOC_USAGE_SW_WRITE_OFTEN;
518 }
519 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET) {
520 flags |= GRALLOC_USAGE_HW_RENDER;
521 }
522
523 r = native_window_set_usage(nw, flags);
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800524 if (r) {
525 rsc->setError(RS_ERROR_DRIVER, "Error setting IO output buffer usage.");
526 return;
527 }
528
529 r = native_window_set_buffers_dimensions(nw, alloc->mHal.state.dimensionX,
530 alloc->mHal.state.dimensionY);
531 if (r) {
532 rsc->setError(RS_ERROR_DRIVER, "Error setting IO output buffer dimensions.");
533 return;
534 }
535
536 r = native_window_set_buffer_count(nw, 3);
537 if (r) {
538 rsc->setError(RS_ERROR_DRIVER, "Error setting IO output buffer count.");
539 return;
540 }
541
542 IoGetBuffer(rsc, alloc, nw);
543 }
544}
545
546void rsdAllocationIoSend(const Context *rsc, Allocation *alloc) {
547 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
548 ANativeWindow *nw = alloc->mHal.state.wndSurface;
549
Jason Samsb3220332012-04-02 14:41:54 -0700550 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_GRAPHICS_RENDER_TARGET) {
551 RsdHal *dc = (RsdHal *)rsc->mHal.drv;
552 RSD_CALL_GL(eglSwapBuffers, dc->gl.egl.display, dc->gl.egl.surface);
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800553 return;
554 }
555
Jason Samsb3220332012-04-02 14:41:54 -0700556 if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_SCRIPT) {
557 GraphicBufferMapper &mapper = GraphicBufferMapper::get();
558 mapper.unlock(drv->wndBuffer->handle);
Jamie Genniscd919a12012-06-13 16:34:11 -0700559 int32_t r = nw->queueBuffer(nw, drv->wndBuffer, -1);
Jason Samsb3220332012-04-02 14:41:54 -0700560 if (r) {
561 rsc->setError(RS_ERROR_DRIVER, "Error sending IO output buffer.");
562 return;
563 }
564
565 IoGetBuffer(rsc, alloc, nw);
566 }
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800567}
568
569void rsdAllocationIoReceive(const Context *rsc, Allocation *alloc) {
Jason Sams3522f402012-03-23 11:47:26 -0700570 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
571 alloc->mHal.state.surfaceTexture->updateTexImage();
Jason Sams7ac2a4d2012-02-15 12:04:24 -0800572}
573
574
Jason Samseb4fe182011-05-26 16:33:01 -0700575void rsdAllocationData1D(const Context *rsc, const Allocation *alloc,
576 uint32_t xoff, uint32_t lod, uint32_t count,
Alex Sakhartchoukc794cd52012-02-13 11:57:32 -0800577 const void *data, size_t sizeBytes) {
Jason Samseb4fe182011-05-26 16:33:01 -0700578 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
579
580 const uint32_t eSize = alloc->mHal.state.type->getElementSizeBytes();
Jason Sams807fdc42012-07-25 17:55:39 -0700581 uint8_t * ptr = GetOffsetPtr(alloc, xoff, 0, 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X);
Jason Samseb4fe182011-05-26 16:33:01 -0700582 uint32_t size = count * eSize;
583
584 if (alloc->mHal.state.hasReferences) {
585 alloc->incRefs(data, count);
586 alloc->decRefs(ptr, count);
587 }
588
589 memcpy(ptr, data, size);
590 drv->uploadDeferred = true;
591}
592
593void rsdAllocationData2D(const Context *rsc, const Allocation *alloc,
594 uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,
Alex Sakhartchoukc794cd52012-02-13 11:57:32 -0800595 uint32_t w, uint32_t h, const void *data, size_t sizeBytes) {
Jason Samseb4fe182011-05-26 16:33:01 -0700596 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
597
598 uint32_t eSize = alloc->mHal.state.elementSizeBytes;
599 uint32_t lineSize = eSize * w;
Jason Samseb4fe182011-05-26 16:33:01 -0700600
Jason Sams807fdc42012-07-25 17:55:39 -0700601 if (drv->lod[0].mallocPtr) {
Jason Samseb4fe182011-05-26 16:33:01 -0700602 const uint8_t *src = static_cast<const uint8_t *>(data);
Jason Sams807fdc42012-07-25 17:55:39 -0700603 uint8_t *dst = GetOffsetPtr(alloc, xoff, yoff, lod, face);
Jason Samseb4fe182011-05-26 16:33:01 -0700604
605 for (uint32_t line=yoff; line < (yoff+h); line++) {
606 if (alloc->mHal.state.hasReferences) {
607 alloc->incRefs(src, w);
608 alloc->decRefs(dst, w);
609 }
610 memcpy(dst, src, lineSize);
611 src += lineSize;
Jason Sams807fdc42012-07-25 17:55:39 -0700612 dst += drv->lod[lod].stride;
Jason Samseb4fe182011-05-26 16:33:01 -0700613 }
614 drv->uploadDeferred = true;
615 } else {
Jason Sams2382aba2011-09-13 15:41:01 -0700616 Update2DTexture(rsc, alloc, data, xoff, yoff, lod, face, w, h);
Jason Samseb4fe182011-05-26 16:33:01 -0700617 }
618}
619
620void rsdAllocationData3D(const Context *rsc, const Allocation *alloc,
621 uint32_t xoff, uint32_t yoff, uint32_t zoff,
622 uint32_t lod, RsAllocationCubemapFace face,
623 uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes) {
624
625}
626
Jason Sams807fdc42012-07-25 17:55:39 -0700627void rsdAllocationRead1D(const Context *rsc, const Allocation *alloc,
628 uint32_t xoff, uint32_t lod, uint32_t count,
629 void *data, size_t sizeBytes) {
630 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
631
632 const uint32_t eSize = alloc->mHal.state.type->getElementSizeBytes();
633 const uint8_t * ptr = GetOffsetPtr(alloc, xoff, 0, 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X);
634 memcpy(data, ptr, count * eSize);
635}
636
637void rsdAllocationRead2D(const Context *rsc, const Allocation *alloc,
638 uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face,
639 uint32_t w, uint32_t h, void *data, size_t sizeBytes) {
640 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
641
642 uint32_t eSize = alloc->mHal.state.elementSizeBytes;
643 uint32_t lineSize = eSize * w;
644
645 if (drv->lod[0].mallocPtr) {
646 uint8_t *dst = static_cast<uint8_t *>(data);
647 const uint8_t *src = GetOffsetPtr(alloc, xoff, yoff, lod, face);
648
649 for (uint32_t line=yoff; line < (yoff+h); line++) {
650 memcpy(dst, src, lineSize);
651 dst += lineSize;
652 src += drv->lod[lod].stride;
653 }
654 } else {
655 ALOGE("Add code to readback from non-script memory");
656 }
657}
658
659void rsdAllocationRead3D(const Context *rsc, const Allocation *alloc,
660 uint32_t xoff, uint32_t yoff, uint32_t zoff,
661 uint32_t lod, RsAllocationCubemapFace face,
662 uint32_t w, uint32_t h, uint32_t d, void *data, uint32_t sizeBytes) {
663
664}
665
666void * rsdAllocationLock1D(const android::renderscript::Context *rsc,
667 const android::renderscript::Allocation *alloc) {
668 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
669 return drv->lod[0].mallocPtr;
670}
671
672void rsdAllocationUnlock1D(const android::renderscript::Context *rsc,
673 const android::renderscript::Allocation *alloc) {
674
675}
676
Alex Sakhartchouk74a82792011-06-14 11:13:19 -0700677void rsdAllocationData1D_alloc(const android::renderscript::Context *rsc,
678 const android::renderscript::Allocation *dstAlloc,
679 uint32_t dstXoff, uint32_t dstLod, uint32_t count,
680 const android::renderscript::Allocation *srcAlloc,
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700681 uint32_t srcXoff, uint32_t srcLod) {
682}
683
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700684
685void rsdAllocationData2D_alloc_script(const android::renderscript::Context *rsc,
686 const android::renderscript::Allocation *dstAlloc,
687 uint32_t dstXoff, uint32_t dstYoff, uint32_t dstLod,
688 RsAllocationCubemapFace dstFace, uint32_t w, uint32_t h,
689 const android::renderscript::Allocation *srcAlloc,
690 uint32_t srcXoff, uint32_t srcYoff, uint32_t srcLod,
691 RsAllocationCubemapFace srcFace) {
692 uint32_t elementSize = dstAlloc->getType()->getElementSizeBytes();
693 for (uint32_t i = 0; i < h; i ++) {
Jason Sams807fdc42012-07-25 17:55:39 -0700694 uint8_t *dstPtr = GetOffsetPtr(dstAlloc, dstXoff, dstYoff + i, dstLod, dstFace);
695 uint8_t *srcPtr = GetOffsetPtr(srcAlloc, srcXoff, srcYoff + i, srcLod, srcFace);
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700696 memcpy(dstPtr, srcPtr, w * elementSize);
697
Steve Blockaf12ac62012-01-06 19:20:56 +0000698 //ALOGE("COPIED dstXoff(%u), dstYoff(%u), dstLod(%u), dstFace(%u), w(%u), h(%u), srcXoff(%u), srcYoff(%u), srcLod(%u), srcFace(%u)",
Stephen Hines0a44ab42011-06-23 16:18:28 -0700699 // dstXoff, dstYoff, dstLod, dstFace, w, h, srcXoff, srcYoff, srcLod, srcFace);
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700700 }
Alex Sakhartchouk74a82792011-06-14 11:13:19 -0700701}
702
703void rsdAllocationData2D_alloc(const android::renderscript::Context *rsc,
704 const android::renderscript::Allocation *dstAlloc,
705 uint32_t dstXoff, uint32_t dstYoff, uint32_t dstLod,
706 RsAllocationCubemapFace dstFace, uint32_t w, uint32_t h,
707 const android::renderscript::Allocation *srcAlloc,
708 uint32_t srcXoff, uint32_t srcYoff, uint32_t srcLod,
709 RsAllocationCubemapFace srcFace) {
Alex Sakhartchouka9495242011-06-16 11:05:13 -0700710 if (!dstAlloc->getIsScript() && !srcAlloc->getIsScript()) {
711 rsc->setError(RS_ERROR_FATAL_DRIVER, "Non-script allocation copies not "
712 "yet implemented.");
713 return;
714 }
715 rsdAllocationData2D_alloc_script(rsc, dstAlloc, dstXoff, dstYoff,
716 dstLod, dstFace, w, h, srcAlloc,
717 srcXoff, srcYoff, srcLod, srcFace);
Alex Sakhartchouk74a82792011-06-14 11:13:19 -0700718}
719
720void rsdAllocationData3D_alloc(const android::renderscript::Context *rsc,
721 const android::renderscript::Allocation *dstAlloc,
722 uint32_t dstXoff, uint32_t dstYoff, uint32_t dstZoff,
723 uint32_t dstLod, RsAllocationCubemapFace dstFace,
724 uint32_t w, uint32_t h, uint32_t d,
725 const android::renderscript::Allocation *srcAlloc,
726 uint32_t srcXoff, uint32_t srcYoff, uint32_t srcZoff,
727 uint32_t srcLod, RsAllocationCubemapFace srcFace) {
728}
729
Jason Samseb4fe182011-05-26 16:33:01 -0700730void rsdAllocationElementData1D(const Context *rsc, const Allocation *alloc,
731 uint32_t x,
732 const void *data, uint32_t cIdx, uint32_t sizeBytes) {
733 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
734
735 uint32_t eSize = alloc->mHal.state.elementSizeBytes;
Jason Sams807fdc42012-07-25 17:55:39 -0700736 uint8_t * ptr = GetOffsetPtr(alloc, x, 0, 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X);
Jason Samseb4fe182011-05-26 16:33:01 -0700737
738 const Element * e = alloc->mHal.state.type->getElement()->getField(cIdx);
739 ptr += alloc->mHal.state.type->getElement()->getFieldOffsetBytes(cIdx);
740
741 if (alloc->mHal.state.hasReferences) {
742 e->incRefs(data);
743 e->decRefs(ptr);
744 }
745
746 memcpy(ptr, data, sizeBytes);
747 drv->uploadDeferred = true;
748}
749
750void rsdAllocationElementData2D(const Context *rsc, const Allocation *alloc,
751 uint32_t x, uint32_t y,
752 const void *data, uint32_t cIdx, uint32_t sizeBytes) {
753 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
754
755 uint32_t eSize = alloc->mHal.state.elementSizeBytes;
Jason Sams807fdc42012-07-25 17:55:39 -0700756 uint8_t * ptr = GetOffsetPtr(alloc, x, y, 0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X);
Jason Samseb4fe182011-05-26 16:33:01 -0700757
758 const Element * e = alloc->mHal.state.type->getElement()->getField(cIdx);
759 ptr += alloc->mHal.state.type->getElement()->getFieldOffsetBytes(cIdx);
760
761 if (alloc->mHal.state.hasReferences) {
762 e->incRefs(data);
763 e->decRefs(ptr);
764 }
765
766 memcpy(ptr, data, sizeBytes);
767 drv->uploadDeferred = true;
768}
769
Jason Sams61a4bb72012-07-25 19:33:43 -0700770static void mip565(const Allocation *alloc, int lod, RsAllocationCubemapFace face) {
771 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
772 uint32_t w = drv->lod[lod + 1].dimX;
773 uint32_t h = drv->lod[lod + 1].dimY;
774
775 for (uint32_t y=0; y < h; y++) {
776 uint16_t *oPtr = (uint16_t *)GetOffsetPtr(alloc, 0, y, lod + 1, face);
777 const uint16_t *i1 = (uint16_t *)GetOffsetPtr(alloc, 0, y*2, lod, face);
778 const uint16_t *i2 = (uint16_t *)GetOffsetPtr(alloc, 0, y*2+1, lod, face);
779
780 for (uint32_t x=0; x < w; x++) {
781 *oPtr = rsBoxFilter565(i1[0], i1[1], i2[0], i2[1]);
782 oPtr ++;
783 i1 += 2;
784 i2 += 2;
785 }
786 }
787}
788
789static void mip8888(const Allocation *alloc, int lod, RsAllocationCubemapFace face) {
790 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
791 uint32_t w = drv->lod[lod + 1].dimX;
792 uint32_t h = drv->lod[lod + 1].dimY;
793
794 for (uint32_t y=0; y < h; y++) {
795 uint32_t *oPtr = (uint32_t *)GetOffsetPtr(alloc, 0, y, lod + 1, face);
796 const uint32_t *i1 = (uint32_t *)GetOffsetPtr(alloc, 0, y*2, lod, face);
797 const uint32_t *i2 = (uint32_t *)GetOffsetPtr(alloc, 0, y*2+1, lod, face);
798
799 for (uint32_t x=0; x < w; x++) {
800 *oPtr = rsBoxFilter8888(i1[0], i1[1], i2[0], i2[1]);
801 oPtr ++;
802 i1 += 2;
803 i2 += 2;
804 }
805 }
806}
807
808static void mip8(const Allocation *alloc, int lod, RsAllocationCubemapFace face) {
809 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
810 uint32_t w = drv->lod[lod + 1].dimX;
811 uint32_t h = drv->lod[lod + 1].dimY;
812
813 for (uint32_t y=0; y < h; y++) {
814 uint8_t *oPtr = GetOffsetPtr(alloc, 0, y, lod + 1, face);
815 const uint8_t *i1 = GetOffsetPtr(alloc, 0, y*2, lod, face);
816 const uint8_t *i2 = GetOffsetPtr(alloc, 0, y*2+1, lod, face);
817
818 for (uint32_t x=0; x < w; x++) {
819 *oPtr = (uint8_t)(((uint32_t)i1[0] + i1[1] + i2[0] + i2[1]) * 0.25f);
820 oPtr ++;
821 i1 += 2;
822 i2 += 2;
823 }
824 }
825}
826
827void rsdAllocationGenerateMipmaps(const Context *rsc, const Allocation *alloc) {
828 DrvAllocation *drv = (DrvAllocation *)alloc->mHal.drv;
829 if(!drv->lod[0].mallocPtr) {
830 return;
831 }
832 uint32_t numFaces = alloc->getType()->getDimFaces() ? 6 : 1;
833 for (uint32_t face = 0; face < numFaces; face ++) {
834 for (uint32_t lod=0; lod < (alloc->getType()->getLODCount() -1); lod++) {
835 switch (alloc->getType()->getElement()->getSizeBits()) {
836 case 32:
837 mip8888(alloc, lod, (RsAllocationCubemapFace)face);
838 break;
839 case 16:
840 mip565(alloc, lod, (RsAllocationCubemapFace)face);
841 break;
842 case 8:
843 mip8(alloc, lod, (RsAllocationCubemapFace)face);
844 break;
845 }
846 }
847 }
848}
849
Jason Samseb4fe182011-05-26 16:33:01 -0700850