Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2009 The Android Open Source Project |
| 3 | * |
| 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 | */ |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 16 | #ifndef ANDROID_RS_BUILD_FOR_HOST |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 17 | #include "rsContext.h" |
| 18 | |
Jason Sams | 4b962e5 | 2009-06-22 17:15:15 -0700 | [diff] [blame] | 19 | #include <GLES/gl.h> |
Jason Sams | c2908e6 | 2010-02-23 17:44:28 -0800 | [diff] [blame] | 20 | #include <GLES2/gl2.h> |
Jason Sams | 4b962e5 | 2009-06-22 17:15:15 -0700 | [diff] [blame] | 21 | #include <GLES/glext.h> |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 22 | #else |
| 23 | #include "rsContextHostStub.h" |
| 24 | |
| 25 | #include <OpenGL/gl.h> |
| 26 | #include <OpenGl/glext.h> |
| 27 | #endif |
Jason Sams | 4b962e5 | 2009-06-22 17:15:15 -0700 | [diff] [blame] | 28 | |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 29 | #include "utils/StopWatch.h" |
| 30 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 31 | using namespace android; |
| 32 | using namespace android::renderscript; |
| 33 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 34 | Allocation::Allocation(Context *rsc, const Type *type, uint32_t usages) : ObjectBase(rsc) { |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 35 | init(rsc, type); |
| 36 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 37 | mUsageFlags = usages; |
| 38 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 39 | allocScriptMemory(); |
Jason Sams | ee73498 | 2010-08-12 12:44:02 -0700 | [diff] [blame] | 40 | if (mType->getElement()->getHasReferences()) { |
| 41 | memset(mPtr, 0, mType->getSizeBytes()); |
| 42 | } |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 43 | if (!mPtr) { |
| 44 | LOGE("Allocation::Allocation, alloc failure"); |
| 45 | } |
| 46 | } |
| 47 | |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 48 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 49 | void Allocation::init(Context *rsc, const Type *type) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 50 | mPtr = NULL; |
| 51 | |
| 52 | mCpuWrite = false; |
| 53 | mCpuRead = false; |
| 54 | mGpuWrite = false; |
| 55 | mGpuRead = false; |
| 56 | |
| 57 | mReadWriteRatio = 0; |
| 58 | mUpdateSize = 0; |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 59 | mUsageFlags = 0; |
| 60 | mMipmapControl = RS_ALLOCATION_MIPMAP_NONE; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 61 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 62 | mTextureID = 0; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 63 | mBufferID = 0; |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 64 | mUploadDefered = false; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 65 | |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 66 | mUserBitmapCallback = NULL; |
| 67 | mUserBitmapCallbackData = NULL; |
| 68 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 69 | mType.set(type); |
Jason Sams | 1bada8c | 2009-08-09 17:01:55 -0700 | [diff] [blame] | 70 | rsAssert(type); |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 71 | |
| 72 | mPtr = NULL; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 73 | } |
| 74 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 75 | Allocation::~Allocation() { |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 76 | if (mUserBitmapCallback != NULL) { |
| 77 | mUserBitmapCallback(mUserBitmapCallbackData); |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 78 | mPtr = NULL; |
Jason Sams | 8a64743f | 2010-03-01 15:31:04 -0800 | [diff] [blame] | 79 | } |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 80 | freeScriptMemory(); |
Jason Sams | 9d5e03d | 2009-11-03 11:25:42 -0800 | [diff] [blame] | 81 | |
| 82 | if (mBufferID) { |
| 83 | // Causes a SW crash.... |
| 84 | //LOGV(" mBufferID %i", mBufferID); |
| 85 | //glDeleteBuffers(1, &mBufferID); |
| 86 | //mBufferID = 0; |
| 87 | } |
| 88 | if (mTextureID) { |
| 89 | glDeleteTextures(1, &mTextureID); |
| 90 | mTextureID = 0; |
| 91 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 92 | } |
| 93 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 94 | void Allocation::setCpuWritable(bool) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 95 | } |
| 96 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 97 | void Allocation::setGpuWritable(bool) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 98 | } |
| 99 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 100 | void Allocation::setCpuReadable(bool) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 101 | } |
| 102 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 103 | void Allocation::setGpuReadable(bool) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 104 | } |
| 105 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 106 | bool Allocation::fixAllocation() { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 107 | return false; |
| 108 | } |
| 109 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 110 | void Allocation::deferedUploadToTexture(const Context *rsc) { |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 111 | mUsageFlags |= RS_ALLOCATION_USAGE_GRAPHICS_TEXTURE; |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 112 | mUploadDefered = true; |
| 113 | } |
| 114 | |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 115 | uint32_t Allocation::getGLTarget() const { |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 116 | if (getIsTexture()) { |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 117 | if (mType->getDimFaces()) { |
| 118 | return GL_TEXTURE_CUBE_MAP; |
| 119 | } else { |
| 120 | return GL_TEXTURE_2D; |
| 121 | } |
| 122 | } |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 123 | if (getIsBufferObject()) { |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 124 | return GL_ARRAY_BUFFER; |
| 125 | } |
| 126 | return 0; |
| 127 | } |
| 128 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 129 | void Allocation::allocScriptMemory() { |
| 130 | rsAssert(!mPtr); |
| 131 | mPtr = malloc(mType->getSizeBytes()); |
| 132 | } |
| 133 | |
| 134 | void Allocation::freeScriptMemory() { |
| 135 | rsAssert(!(mUsageFlags & RS_ALLOCATION_USAGE_SCRIPT)); |
| 136 | if (mPtr) { |
| 137 | free(mPtr); |
| 138 | mPtr = NULL; |
| 139 | } |
| 140 | } |
| 141 | |
| 142 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 143 | void Allocation::syncAll(Context *rsc, RsAllocationUsageType src) { |
| 144 | rsAssert(src == RS_ALLOCATION_USAGE_SCRIPT); |
| 145 | |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 146 | if (getIsTexture()) { |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 147 | uploadToTexture(rsc); |
| 148 | } |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 149 | if (getIsBufferObject()) { |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 150 | uploadToBufferObject(rsc); |
| 151 | } |
| 152 | |
| 153 | mUploadDefered = false; |
| 154 | } |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 155 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 156 | void Allocation::uploadToTexture(const Context *rsc) { |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 157 | |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 158 | mUsageFlags |= RS_ALLOCATION_USAGE_GRAPHICS_TEXTURE; |
Jason Sams | 718cd1f | 2009-12-23 14:35:29 -0800 | [diff] [blame] | 159 | GLenum type = mType->getElement()->getComponent().getGLType(); |
| 160 | GLenum format = mType->getElement()->getComponent().getGLFormat(); |
Jason Sams | e2ae85f | 2009-06-03 16:04:54 -0700 | [diff] [blame] | 161 | |
| 162 | if (!type || !format) { |
| 163 | return; |
| 164 | } |
| 165 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 166 | if (!mPtr) { |
| 167 | return; |
| 168 | } |
| 169 | |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 170 | bool isFirstUpload = false; |
| 171 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 172 | if (!mTextureID) { |
| 173 | glGenTextures(1, &mTextureID); |
Jason Sams | 9dab667 | 2009-11-24 12:26:35 -0800 | [diff] [blame] | 174 | |
| 175 | if (!mTextureID) { |
| 176 | // This should not happen, however, its likely the cause of the |
| 177 | // white sqare bug. |
| 178 | // Force a crash to 1: restart the app, 2: make sure we get a bugreport. |
| 179 | LOGE("Upload to texture failed to gen mTextureID"); |
| 180 | rsc->dumpDebug(); |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 181 | mUploadDefered = true; |
| 182 | return; |
Jason Sams | 9dab667 | 2009-11-24 12:26:35 -0800 | [diff] [blame] | 183 | } |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 184 | isFirstUpload = true; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 185 | } |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 186 | |
| 187 | GLenum target = (GLenum)getGLTarget(); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 188 | if (target == GL_TEXTURE_2D) { |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 189 | upload2DTexture(isFirstUpload, mPtr); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 190 | } else if (target == GL_TEXTURE_CUBE_MAP) { |
| 191 | uploadCubeTexture(isFirstUpload); |
| 192 | } |
| 193 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 194 | if (!(mUsageFlags & RS_ALLOCATION_USAGE_SCRIPT)) { |
| 195 | freeScriptMemory(); |
| 196 | } |
| 197 | |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 198 | rsc->checkError("Allocation::uploadToTexture"); |
| 199 | } |
| 200 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 201 | void Allocation::upload2DTexture(bool isFirstUpload, const void *ptr) { |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 202 | GLenum type = mType->getElement()->getComponent().getGLType(); |
| 203 | GLenum format = mType->getElement()->getComponent().getGLFormat(); |
| 204 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 205 | GLenum target = (GLenum)getGLTarget(); |
| 206 | glBindTexture(target, mTextureID); |
| 207 | glPixelStorei(GL_UNPACK_ALIGNMENT, 1); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 208 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 209 | for (uint32_t lod = 0; lod < mType->getLODCount(); lod++) { |
| 210 | const uint8_t *p = (const uint8_t *)ptr; |
| 211 | p += mType->getLODOffset(lod); |
| 212 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 213 | if (isFirstUpload) { |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 214 | glTexImage2D(GL_TEXTURE_2D, lod, format, |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 215 | mType->getLODDimX(lod), mType->getLODDimY(lod), |
| 216 | 0, format, type, p); |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 217 | } else { |
| 218 | glTexSubImage2D(GL_TEXTURE_2D, lod, 0, 0, |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 219 | mType->getLODDimX(lod), mType->getLODDimY(lod), |
| 220 | format, type, p); |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 221 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 222 | } |
Jason Sams | 6d8eb26 | 2010-12-15 01:41:00 -0800 | [diff] [blame^] | 223 | |
| 224 | if (mMipmapControl == RS_ALLOCATION_MIPMAP_ON_SYNC_TO_TEXTURE) { |
| 225 | #ifndef ANDROID_RS_BUILD_FOR_HOST |
| 226 | glGenerateMipmap(target); |
| 227 | #endif //ANDROID_RS_BUILD_FOR_HOST |
| 228 | } |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 229 | } |
Jason Sams | c2908e6 | 2010-02-23 17:44:28 -0800 | [diff] [blame] | 230 | |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 231 | void Allocation::uploadCubeTexture(bool isFirstUpload) { |
| 232 | GLenum type = mType->getElement()->getComponent().getGLType(); |
| 233 | GLenum format = mType->getElement()->getComponent().getGLFormat(); |
| 234 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 235 | GLenum target = (GLenum)getGLTarget(); |
| 236 | glBindTexture(target, mTextureID); |
| 237 | glPixelStorei(GL_UNPACK_ALIGNMENT, 1); |
| 238 | |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 239 | GLenum faceOrder[] = { |
| 240 | GL_TEXTURE_CUBE_MAP_POSITIVE_X, |
| 241 | GL_TEXTURE_CUBE_MAP_NEGATIVE_X, |
| 242 | GL_TEXTURE_CUBE_MAP_POSITIVE_Y, |
| 243 | GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, |
| 244 | GL_TEXTURE_CUBE_MAP_POSITIVE_Z, |
| 245 | GL_TEXTURE_CUBE_MAP_NEGATIVE_Z |
| 246 | }; |
| 247 | |
| 248 | Adapter2D adapt(getContext(), this); |
| 249 | for (uint32_t face = 0; face < 6; face ++) { |
| 250 | adapt.setFace(face); |
| 251 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 252 | for (uint32_t lod = 0; lod < mType->getLODCount(); lod++) { |
| 253 | adapt.setLOD(lod); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 254 | |
| 255 | uint16_t * ptr = static_cast<uint16_t *>(adapt.getElement(0,0)); |
| 256 | |
| 257 | if (isFirstUpload) { |
| 258 | glTexImage2D(faceOrder[face], lod, format, |
| 259 | adapt.getDimX(), adapt.getDimY(), |
| 260 | 0, format, type, ptr); |
| 261 | } else { |
| 262 | glTexSubImage2D(faceOrder[face], lod, 0, 0, |
| 263 | adapt.getDimX(), adapt.getDimY(), |
| 264 | format, type, ptr); |
| 265 | } |
| 266 | } |
| 267 | } |
Jason Sams | 6d8eb26 | 2010-12-15 01:41:00 -0800 | [diff] [blame^] | 268 | |
| 269 | if (mMipmapControl == RS_ALLOCATION_MIPMAP_ON_SYNC_TO_TEXTURE) { |
| 270 | #ifndef ANDROID_RS_BUILD_FOR_HOST |
| 271 | glGenerateMipmap(target); |
| 272 | #endif //ANDROID_RS_BUILD_FOR_HOST |
| 273 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 274 | } |
| 275 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 276 | void Allocation::deferedUploadToBufferObject(const Context *rsc) { |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 277 | mUsageFlags |= RS_ALLOCATION_USAGE_GRAPHICS_VERTEX; |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 278 | mUploadDefered = true; |
| 279 | } |
| 280 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 281 | void Allocation::uploadToBufferObject(const Context *rsc) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 282 | rsAssert(!mType->getDimY()); |
| 283 | rsAssert(!mType->getDimZ()); |
| 284 | |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 285 | mUsageFlags |= RS_ALLOCATION_USAGE_GRAPHICS_VERTEX; |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 286 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 287 | if (!mBufferID) { |
| 288 | glGenBuffers(1, &mBufferID); |
| 289 | } |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 290 | if (!mBufferID) { |
| 291 | LOGE("Upload to buffer object failed"); |
| 292 | mUploadDefered = true; |
| 293 | return; |
| 294 | } |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 295 | GLenum target = (GLenum)getGLTarget(); |
| 296 | glBindBuffer(target, mBufferID); |
| 297 | glBufferData(target, mType->getSizeBytes(), getPtr(), GL_DYNAMIC_DRAW); |
| 298 | glBindBuffer(target, 0); |
Jason Sams | f468700 | 2010-03-10 17:30:41 -0800 | [diff] [blame] | 299 | rsc->checkError("Allocation::uploadToBufferObject"); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 300 | } |
| 301 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 302 | void Allocation::uploadCheck(Context *rsc) { |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 303 | if (mUploadDefered) { |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 304 | syncAll(rsc, RS_ALLOCATION_USAGE_SCRIPT); |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 305 | } |
| 306 | } |
| 307 | |
Jason Sams | 1bada8c | 2009-08-09 17:01:55 -0700 | [diff] [blame] | 308 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 309 | void Allocation::data(Context *rsc, const void *data, uint32_t sizeBytes) { |
Jason Sams | 07ae406 | 2009-08-27 20:23:34 -0700 | [diff] [blame] | 310 | uint32_t size = mType->getSizeBytes(); |
| 311 | if (size != sizeBytes) { |
| 312 | LOGE("Allocation::data called with mismatched size expected %i, got %i", size, sizeBytes); |
| 313 | return; |
| 314 | } |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 315 | |
| 316 | if (mType->getElement()->getHasReferences()) { |
| 317 | incRefs(data, sizeBytes / mType->getElement()->getSizeBytes()); |
| 318 | decRefs(mPtr, sizeBytes / mType->getElement()->getSizeBytes()); |
| 319 | } |
| 320 | |
Jason Sams | 07ae406 | 2009-08-27 20:23:34 -0700 | [diff] [blame] | 321 | memcpy(mPtr, data, size); |
Jason Sams | 83f1c63 | 2009-10-26 15:19:28 -0700 | [diff] [blame] | 322 | sendDirty(); |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 323 | mUploadDefered = true; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 324 | } |
| 325 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 326 | void Allocation::read(void *data) { |
Jason Sams | 40a29e8 | 2009-08-10 14:55:26 -0700 | [diff] [blame] | 327 | memcpy(data, mPtr, mType->getSizeBytes()); |
| 328 | } |
| 329 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 330 | void Allocation::subData(Context *rsc, uint32_t xoff, uint32_t count, const void *data, uint32_t sizeBytes) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 331 | uint32_t eSize = mType->getElementSizeBytes(); |
| 332 | uint8_t * ptr = static_cast<uint8_t *>(mPtr); |
| 333 | ptr += eSize * xoff; |
Jason Sams | 07ae406 | 2009-08-27 20:23:34 -0700 | [diff] [blame] | 334 | uint32_t size = count * eSize; |
| 335 | |
| 336 | if (size != sizeBytes) { |
| 337 | LOGE("Allocation::subData called with mismatched size expected %i, got %i", size, sizeBytes); |
Jason Sams | 3c0dfba | 2009-09-27 17:50:38 -0700 | [diff] [blame] | 338 | mType->dumpLOGV("type info"); |
Jason Sams | 07ae406 | 2009-08-27 20:23:34 -0700 | [diff] [blame] | 339 | return; |
| 340 | } |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 341 | |
| 342 | if (mType->getElement()->getHasReferences()) { |
| 343 | incRefs(data, count); |
| 344 | decRefs(ptr, count); |
| 345 | } |
| 346 | |
Jason Sams | 07ae406 | 2009-08-27 20:23:34 -0700 | [diff] [blame] | 347 | memcpy(ptr, data, size); |
Jason Sams | 83f1c63 | 2009-10-26 15:19:28 -0700 | [diff] [blame] | 348 | sendDirty(); |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 349 | mUploadDefered = true; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 350 | } |
| 351 | |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 352 | void Allocation::subData(Context *rsc, uint32_t xoff, uint32_t yoff, |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 353 | uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 354 | uint32_t eSize = mType->getElementSizeBytes(); |
| 355 | uint32_t lineSize = eSize * w; |
| 356 | uint32_t destW = mType->getDimX(); |
| 357 | |
| 358 | const uint8_t *src = static_cast<const uint8_t *>(data); |
| 359 | uint8_t *dst = static_cast<uint8_t *>(mPtr); |
| 360 | dst += eSize * (xoff + yoff * destW); |
Jason Sams | 07ae406 | 2009-08-27 20:23:34 -0700 | [diff] [blame] | 361 | |
| 362 | if ((lineSize * eSize * h) != sizeBytes) { |
| 363 | rsAssert(!"Allocation::subData called with mismatched size"); |
| 364 | return; |
| 365 | } |
| 366 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 367 | for (uint32_t line=yoff; line < (yoff+h); line++) { |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 368 | if (mType->getElement()->getHasReferences()) { |
| 369 | incRefs(src, w); |
| 370 | decRefs(dst, w); |
| 371 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 372 | memcpy(dst, src, lineSize); |
| 373 | src += lineSize; |
| 374 | dst += destW * eSize; |
| 375 | } |
Jason Sams | 83f1c63 | 2009-10-26 15:19:28 -0700 | [diff] [blame] | 376 | sendDirty(); |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 377 | mUploadDefered = true; |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 378 | } |
| 379 | |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 380 | void Allocation::subData(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t zoff, |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 381 | uint32_t w, uint32_t h, uint32_t d, const void *data, uint32_t sizeBytes) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 382 | } |
| 383 | |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 384 | void Allocation::subElementData(Context *rsc, uint32_t x, const void *data, |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 385 | uint32_t cIdx, uint32_t sizeBytes) { |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 386 | uint32_t eSize = mType->getElementSizeBytes(); |
| 387 | uint8_t * ptr = static_cast<uint8_t *>(mPtr); |
| 388 | ptr += eSize * x; |
| 389 | |
| 390 | if (cIdx >= mType->getElement()->getFieldCount()) { |
| 391 | LOGE("Error Allocation::subElementData component %i out of range.", cIdx); |
| 392 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData component out of range."); |
| 393 | return; |
| 394 | } |
| 395 | |
| 396 | if (x >= mType->getDimX()) { |
| 397 | LOGE("Error Allocation::subElementData X offset %i out of range.", x); |
| 398 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData X offset out of range."); |
| 399 | return; |
| 400 | } |
| 401 | |
| 402 | const Element * e = mType->getElement()->getField(cIdx); |
| 403 | ptr += mType->getElement()->getFieldOffsetBytes(cIdx); |
| 404 | |
| 405 | if (sizeBytes != e->getSizeBytes()) { |
| 406 | LOGE("Error Allocation::subElementData data size %i does not match field size %i.", sizeBytes, e->getSizeBytes()); |
| 407 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size."); |
| 408 | return; |
| 409 | } |
| 410 | |
| 411 | if (e->getHasReferences()) { |
| 412 | e->incRefs(data); |
| 413 | e->decRefs(ptr); |
| 414 | } |
| 415 | |
| 416 | memcpy(ptr, data, sizeBytes); |
| 417 | sendDirty(); |
| 418 | mUploadDefered = true; |
| 419 | } |
| 420 | |
| 421 | void Allocation::subElementData(Context *rsc, uint32_t x, uint32_t y, |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 422 | const void *data, uint32_t cIdx, uint32_t sizeBytes) { |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 423 | uint32_t eSize = mType->getElementSizeBytes(); |
| 424 | uint8_t * ptr = static_cast<uint8_t *>(mPtr); |
| 425 | ptr += eSize * (x + y * mType->getDimX()); |
| 426 | |
| 427 | if (x >= mType->getDimX()) { |
| 428 | LOGE("Error Allocation::subElementData X offset %i out of range.", x); |
| 429 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData X offset out of range."); |
| 430 | return; |
| 431 | } |
| 432 | |
| 433 | if (y >= mType->getDimY()) { |
| 434 | LOGE("Error Allocation::subElementData X offset %i out of range.", x); |
| 435 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData X offset out of range."); |
| 436 | return; |
| 437 | } |
| 438 | |
| 439 | if (cIdx >= mType->getElement()->getFieldCount()) { |
| 440 | LOGE("Error Allocation::subElementData component %i out of range.", cIdx); |
| 441 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData component out of range."); |
| 442 | return; |
| 443 | } |
| 444 | |
| 445 | const Element * e = mType->getElement()->getField(cIdx); |
| 446 | ptr += mType->getElement()->getFieldOffsetBytes(cIdx); |
| 447 | |
| 448 | if (sizeBytes != e->getSizeBytes()) { |
| 449 | LOGE("Error Allocation::subElementData data size %i does not match field size %i.", sizeBytes, e->getSizeBytes()); |
| 450 | rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size."); |
| 451 | return; |
| 452 | } |
| 453 | |
| 454 | if (e->getHasReferences()) { |
| 455 | e->incRefs(data); |
| 456 | e->decRefs(ptr); |
| 457 | } |
| 458 | |
| 459 | memcpy(ptr, data, sizeBytes); |
| 460 | sendDirty(); |
| 461 | mUploadDefered = true; |
| 462 | } |
| 463 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 464 | void Allocation::addProgramToDirty(const Program *p) { |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 465 | mToDirtyList.push(p); |
Jason Sams | 83f1c63 | 2009-10-26 15:19:28 -0700 | [diff] [blame] | 466 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 467 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 468 | void Allocation::removeProgramToDirty(const Program *p) { |
Jason Sams | 83f1c63 | 2009-10-26 15:19:28 -0700 | [diff] [blame] | 469 | for (size_t ct=0; ct < mToDirtyList.size(); ct++) { |
| 470 | if (mToDirtyList[ct] == p) { |
| 471 | mToDirtyList.removeAt(ct); |
| 472 | return; |
| 473 | } |
| 474 | } |
| 475 | rsAssert(0); |
| 476 | } |
| 477 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 478 | void Allocation::dumpLOGV(const char *prefix) const { |
Jason Sams | 715333b | 2009-11-17 17:26:46 -0800 | [diff] [blame] | 479 | ObjectBase::dumpLOGV(prefix); |
| 480 | |
| 481 | String8 s(prefix); |
| 482 | s.append(" type "); |
| 483 | if (mType.get()) { |
| 484 | mType->dumpLOGV(s.string()); |
| 485 | } |
| 486 | |
| 487 | LOGV("%s allocation ptr=%p mCpuWrite=%i, mCpuRead=%i, mGpuWrite=%i, mGpuRead=%i", |
| 488 | prefix, mPtr, mCpuWrite, mCpuRead, mGpuWrite, mGpuRead); |
| 489 | |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 490 | LOGV("%s allocation mUsageFlags=0x04%x, mMipmapControl=0x%04x, mTextureID=%i, mBufferID=%i", |
| 491 | prefix, mUsageFlags, mMipmapControl, mTextureID, mBufferID); |
Jason Sams | 715333b | 2009-11-17 17:26:46 -0800 | [diff] [blame] | 492 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 493 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 494 | void Allocation::serialize(OStream *stream) const { |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 495 | // Need to identify ourselves |
| 496 | stream->addU32((uint32_t)getClassId()); |
| 497 | |
| 498 | String8 name(getName()); |
| 499 | stream->addString(&name); |
| 500 | |
| 501 | // First thing we need to serialize is the type object since it will be needed |
| 502 | // to initialize the class |
| 503 | mType->serialize(stream); |
| 504 | |
| 505 | uint32_t dataSize = mType->getSizeBytes(); |
| 506 | // Write how much data we are storing |
| 507 | stream->addU32(dataSize); |
| 508 | // Now write the data |
| 509 | stream->addByteArray(mPtr, dataSize); |
| 510 | } |
| 511 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 512 | Allocation *Allocation::createFromStream(Context *rsc, IStream *stream) { |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 513 | // First make sure we are reading the correct object |
Alex Sakhartchouk | aae74ad | 2010-06-04 10:06:50 -0700 | [diff] [blame] | 514 | RsA3DClassID classID = (RsA3DClassID)stream->loadU32(); |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 515 | if (classID != RS_A3D_CLASS_ID_ALLOCATION) { |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 516 | LOGE("allocation loading skipped due to invalid class id\n"); |
| 517 | return NULL; |
| 518 | } |
| 519 | |
| 520 | String8 name; |
| 521 | stream->loadString(&name); |
| 522 | |
| 523 | Type *type = Type::createFromStream(rsc, stream); |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 524 | if (!type) { |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 525 | return NULL; |
| 526 | } |
| 527 | type->compute(); |
| 528 | |
| 529 | // Number of bytes we wrote out for this allocation |
| 530 | uint32_t dataSize = stream->loadU32(); |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 531 | if (dataSize != type->getSizeBytes()) { |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 532 | LOGE("failed to read allocation because numbytes written is not the same loaded type wants\n"); |
Jason Sams | b38d534 | 2010-10-21 14:06:55 -0700 | [diff] [blame] | 533 | ObjectBase::checkDelete(type); |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 534 | return NULL; |
| 535 | } |
| 536 | |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 537 | Allocation *alloc = new Allocation(rsc, type, RS_ALLOCATION_USAGE_SCRIPT); |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 538 | alloc->setName(name.string(), name.size()); |
| 539 | |
| 540 | // Read in all of our allocation data |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 541 | alloc->data(rsc, stream->getPtr() + stream->getPos(), dataSize); |
Alex Sakhartchouk | 2ce0e3f | 2010-08-11 10:30:44 -0700 | [diff] [blame] | 542 | stream->reset(stream->getPos() + dataSize); |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 543 | |
| 544 | return alloc; |
| 545 | } |
| 546 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 547 | void Allocation::sendDirty() const { |
Jason Sams | 83f1c63 | 2009-10-26 15:19:28 -0700 | [diff] [blame] | 548 | for (size_t ct=0; ct < mToDirtyList.size(); ct++) { |
| 549 | mToDirtyList[ct]->forceDirty(); |
| 550 | } |
| 551 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 552 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 553 | void Allocation::incRefs(const void *ptr, size_t ct, size_t startOff) const { |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 554 | const uint8_t *p = static_cast<const uint8_t *>(ptr); |
| 555 | const Element *e = mType->getElement(); |
| 556 | uint32_t stride = e->getSizeBytes(); |
| 557 | |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 558 | p += stride * startOff; |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 559 | while (ct > 0) { |
| 560 | e->incRefs(p); |
| 561 | ct --; |
| 562 | p += stride; |
| 563 | } |
| 564 | } |
| 565 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 566 | void Allocation::decRefs(const void *ptr, size_t ct, size_t startOff) const { |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 567 | const uint8_t *p = static_cast<const uint8_t *>(ptr); |
| 568 | const Element *e = mType->getElement(); |
| 569 | uint32_t stride = e->getSizeBytes(); |
| 570 | |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 571 | p += stride * startOff; |
Jason Sams | b28ca96f | 2010-08-09 18:13:33 -0700 | [diff] [blame] | 572 | while (ct > 0) { |
| 573 | e->decRefs(p); |
| 574 | ct --; |
| 575 | p += stride; |
| 576 | } |
| 577 | } |
| 578 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 579 | void Allocation::copyRange1D(Context *rsc, const Allocation *src, int32_t srcOff, int32_t destOff, int32_t len) { |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 580 | } |
| 581 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 582 | void Allocation::resize1D(Context *rsc, uint32_t dimX) { |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 583 | Type *t = mType->cloneAndResize1D(rsc, dimX); |
| 584 | |
| 585 | uint32_t oldDimX = mType->getDimX(); |
| 586 | if (dimX == oldDimX) { |
| 587 | return; |
| 588 | } |
| 589 | |
| 590 | if (dimX < oldDimX) { |
| 591 | decRefs(mPtr, oldDimX - dimX, dimX); |
| 592 | } |
| 593 | mPtr = realloc(mPtr, t->getSizeBytes()); |
| 594 | |
| 595 | if (dimX > oldDimX) { |
| 596 | const Element *e = mType->getElement(); |
| 597 | uint32_t stride = e->getSizeBytes(); |
| 598 | memset(((uint8_t *)mPtr) + stride * oldDimX, 0, stride * (dimX - oldDimX)); |
| 599 | } |
| 600 | mType.set(t); |
| 601 | } |
| 602 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 603 | void Allocation::resize2D(Context *rsc, uint32_t dimX, uint32_t dimY) { |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 604 | LOGE("not implemented"); |
| 605 | } |
| 606 | |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 607 | ///////////////// |
Jason Sams | e2ae85f | 2009-06-03 16:04:54 -0700 | [diff] [blame] | 608 | // |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 609 | |
| 610 | |
| 611 | namespace android { |
| 612 | namespace renderscript { |
| 613 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 614 | void rsi_AllocationUploadToTexture(Context *rsc, RsAllocation va, bool genmip, uint32_t baseMipLevel) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 615 | Allocation *alloc = static_cast<Allocation *>(va); |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 616 | alloc->deferedUploadToTexture(rsc); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 617 | } |
| 618 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 619 | void rsi_AllocationUploadToBufferObject(Context *rsc, RsAllocation va) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 620 | Allocation *alloc = static_cast<Allocation *>(va); |
Jason Sams | 3b7d39b | 2009-12-14 12:57:40 -0800 | [diff] [blame] | 621 | alloc->deferedUploadToBufferObject(rsc); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 622 | } |
| 623 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 624 | static void mip565(const Adapter2D &out, const Adapter2D &in) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 625 | uint32_t w = out.getDimX(); |
| 626 | uint32_t h = out.getDimY(); |
| 627 | |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 628 | for (uint32_t y=0; y < h; y++) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 629 | uint16_t *oPtr = static_cast<uint16_t *>(out.getElement(0, y)); |
| 630 | const uint16_t *i1 = static_cast<uint16_t *>(in.getElement(0, y*2)); |
| 631 | const uint16_t *i2 = static_cast<uint16_t *>(in.getElement(0, y*2+1)); |
| 632 | |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 633 | for (uint32_t x=0; x < w; x++) { |
Jason Sams | e2ae85f | 2009-06-03 16:04:54 -0700 | [diff] [blame] | 634 | *oPtr = rsBoxFilter565(i1[0], i1[1], i2[0], i2[1]); |
| 635 | oPtr ++; |
| 636 | i1 += 2; |
| 637 | i2 += 2; |
| 638 | } |
| 639 | } |
| 640 | } |
| 641 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 642 | static void mip8888(const Adapter2D &out, const Adapter2D &in) { |
Jason Sams | e2ae85f | 2009-06-03 16:04:54 -0700 | [diff] [blame] | 643 | uint32_t w = out.getDimX(); |
| 644 | uint32_t h = out.getDimY(); |
| 645 | |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 646 | for (uint32_t y=0; y < h; y++) { |
Jason Sams | e2ae85f | 2009-06-03 16:04:54 -0700 | [diff] [blame] | 647 | uint32_t *oPtr = static_cast<uint32_t *>(out.getElement(0, y)); |
| 648 | const uint32_t *i1 = static_cast<uint32_t *>(in.getElement(0, y*2)); |
| 649 | const uint32_t *i2 = static_cast<uint32_t *>(in.getElement(0, y*2+1)); |
| 650 | |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 651 | for (uint32_t x=0; x < w; x++) { |
Jason Sams | e2ae85f | 2009-06-03 16:04:54 -0700 | [diff] [blame] | 652 | *oPtr = rsBoxFilter8888(i1[0], i1[1], i2[0], i2[1]); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 653 | oPtr ++; |
| 654 | i1 += 2; |
| 655 | i2 += 2; |
| 656 | } |
| 657 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 658 | } |
| 659 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 660 | static void mip8(const Adapter2D &out, const Adapter2D &in) { |
Jason Sams | e20e3b4 | 2010-01-19 17:53:54 -0800 | [diff] [blame] | 661 | uint32_t w = out.getDimX(); |
| 662 | uint32_t h = out.getDimY(); |
| 663 | |
| 664 | for (uint32_t y=0; y < h; y++) { |
| 665 | uint8_t *oPtr = static_cast<uint8_t *>(out.getElement(0, y)); |
| 666 | const uint8_t *i1 = static_cast<uint8_t *>(in.getElement(0, y*2)); |
| 667 | const uint8_t *i2 = static_cast<uint8_t *>(in.getElement(0, y*2+1)); |
| 668 | |
| 669 | for (uint32_t x=0; x < w; x++) { |
| 670 | *oPtr = (uint8_t)(((uint32_t)i1[0] + i1[1] + i2[0] + i2[1]) * 0.25f); |
| 671 | oPtr ++; |
| 672 | i1 += 2; |
| 673 | i2 += 2; |
| 674 | } |
| 675 | } |
| 676 | } |
| 677 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 678 | static void mip(const Adapter2D &out, const Adapter2D &in) { |
| 679 | switch (out.getBaseType()->getElement()->getSizeBits()) { |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 680 | case 32: |
| 681 | mip8888(out, in); |
| 682 | break; |
| 683 | case 16: |
| 684 | mip565(out, in); |
| 685 | break; |
Jason Sams | e20e3b4 | 2010-01-19 17:53:54 -0800 | [diff] [blame] | 686 | case 8: |
| 687 | mip8(out, in); |
| 688 | break; |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 689 | } |
Jason Sams | 6f5c61c | 2009-07-28 17:20:11 -0700 | [diff] [blame] | 690 | } |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 691 | |
Alex Sakhartchouk | aa7d288 | 2010-05-21 12:53:13 -0700 | [diff] [blame] | 692 | #ifndef ANDROID_RS_BUILD_FOR_HOST |
| 693 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 694 | void rsi_AllocationSyncAll(Context *rsc, RsAllocation va, RsAllocationUsageType src) { |
| 695 | Allocation *a = static_cast<Allocation *>(va); |
| 696 | a->syncAll(rsc, src); |
| 697 | } |
| 698 | |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 699 | void rsi_AllocationCopyFromBitmap(Context *rsc, RsAllocation va, const void *data, size_t dataLen) { |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 700 | Allocation *texAlloc = static_cast<Allocation *>(va); |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 701 | const Type * t = texAlloc->getType(); |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 702 | |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 703 | uint32_t w = t->getDimX(); |
| 704 | uint32_t h = t->getDimY(); |
| 705 | bool genMips = t->getDimLOD(); |
| 706 | size_t s = w * h * t->getElementSizeBytes(); |
| 707 | if (s != dataLen) { |
| 708 | rsc->setError(RS_ERROR_BAD_VALUE, "Bitmap size didn't match allocation size"); |
| 709 | return; |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 710 | } |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 711 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 712 | if (texAlloc->getIsScript()) { |
| 713 | memcpy(texAlloc->getPtr(), data, s); |
| 714 | if (genMips) { |
| 715 | Adapter2D adapt(rsc, texAlloc); |
| 716 | Adapter2D adapt2(rsc, texAlloc); |
| 717 | for (uint32_t lod=0; lod < (texAlloc->getType()->getLODCount() -1); lod++) { |
| 718 | adapt.setLOD(lod); |
| 719 | adapt2.setLOD(lod + 1); |
| 720 | mip(adapt2, adapt); |
| 721 | } |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 722 | } |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 723 | } else { |
| 724 | texAlloc->upload2DTexture(false, data); |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 725 | } |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 726 | |
Jason Sams | 4ef6650 | 2010-12-10 16:03:15 -0800 | [diff] [blame] | 727 | } |
| 728 | |
| 729 | void rsi_AllocationCopyToBitmap(Context *rsc, RsAllocation va, void *data, size_t dataLen) { |
| 730 | Allocation *texAlloc = static_cast<Allocation *>(va); |
| 731 | const Type * t = texAlloc->getType(); |
| 732 | |
| 733 | size_t s = t->getDimX() * t->getDimY() * t->getElementSizeBytes(); |
| 734 | if (s != dataLen) { |
| 735 | rsc->setError(RS_ERROR_BAD_VALUE, "Bitmap size didn't match allocation size"); |
| 736 | return; |
| 737 | } |
| 738 | |
| 739 | memcpy(data, texAlloc->getPtr(), s); |
Alex Sakhartchouk | 26ae390 | 2010-10-11 12:35:15 -0700 | [diff] [blame] | 740 | } |
| 741 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 742 | void rsi_AllocationData(Context *rsc, RsAllocation va, const void *data, uint32_t sizeBytes) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 743 | Allocation *a = static_cast<Allocation *>(va); |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 744 | a->data(rsc, data, sizeBytes); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 745 | } |
| 746 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 747 | void rsi_Allocation1DSubData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t count, const void *data, uint32_t sizeBytes) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 748 | Allocation *a = static_cast<Allocation *>(va); |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 749 | a->subData(rsc, xoff, count, data, sizeBytes); |
| 750 | } |
| 751 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 752 | void rsi_Allocation2DSubElementData(Context *rsc, RsAllocation va, uint32_t x, uint32_t y, const void *data, uint32_t eoff, uint32_t sizeBytes) { |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 753 | Allocation *a = static_cast<Allocation *>(va); |
| 754 | a->subElementData(rsc, x, y, data, eoff, sizeBytes); |
| 755 | } |
| 756 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 757 | void rsi_Allocation1DSubElementData(Context *rsc, RsAllocation va, uint32_t x, const void *data, uint32_t eoff, uint32_t sizeBytes) { |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 758 | Allocation *a = static_cast<Allocation *>(va); |
| 759 | a->subElementData(rsc, x, data, eoff, sizeBytes); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 760 | } |
| 761 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 762 | void rsi_Allocation2DSubData(Context *rsc, RsAllocation va, uint32_t xoff, uint32_t yoff, uint32_t w, uint32_t h, const void *data, uint32_t sizeBytes) { |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 763 | Allocation *a = static_cast<Allocation *>(va); |
Jason Sams | 49bdaf0 | 2010-08-31 13:50:42 -0700 | [diff] [blame] | 764 | a->subData(rsc, xoff, yoff, w, h, data, sizeBytes); |
Jason Sams | d19f10d | 2009-05-22 14:03:28 -0700 | [diff] [blame] | 765 | } |
| 766 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 767 | void rsi_AllocationRead(Context *rsc, RsAllocation va, void *data) { |
Jason Sams | 40a29e8 | 2009-08-10 14:55:26 -0700 | [diff] [blame] | 768 | Allocation *a = static_cast<Allocation *>(va); |
| 769 | a->read(data); |
| 770 | } |
| 771 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 772 | void rsi_AllocationResize1D(Context *rsc, RsAllocation va, uint32_t dimX) { |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 773 | Allocation *a = static_cast<Allocation *>(va); |
| 774 | a->resize1D(rsc, dimX); |
| 775 | } |
| 776 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 777 | void rsi_AllocationResize2D(Context *rsc, RsAllocation va, uint32_t dimX, uint32_t dimY) { |
Jason Sams | 5edc608 | 2010-10-05 13:32:49 -0700 | [diff] [blame] | 778 | Allocation *a = static_cast<Allocation *>(va); |
| 779 | a->resize2D(rsc, dimX, dimY); |
| 780 | } |
| 781 | |
Alex Sakhartchouk | 581cc64 | 2010-10-27 14:10:07 -0700 | [diff] [blame] | 782 | #endif //ANDROID_RS_BUILD_FOR_HOST |
| 783 | |
| 784 | } |
| 785 | } |
| 786 | |
Alex Sakhartchouk | ed9f210 | 2010-11-09 17:00:54 -0800 | [diff] [blame] | 787 | const void * rsaAllocationGetType(RsContext con, RsAllocation va) { |
Alex Sakhartchouk | 80a4c2c | 2010-07-12 15:50:32 -0700 | [diff] [blame] | 788 | Allocation *a = static_cast<Allocation *>(va); |
| 789 | a->getType()->incUserRef(); |
| 790 | |
| 791 | return a->getType(); |
| 792 | } |
| 793 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 794 | RsAllocation rsaAllocationCreateTyped(RsContext con, RsType vtype, |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 795 | RsAllocationMipmapControl mips, |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 796 | uint32_t usages) { |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 797 | Context *rsc = static_cast<Context *>(con); |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 798 | Allocation * alloc = new Allocation(rsc, static_cast<Type *>(vtype), usages); |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 799 | alloc->incUserRef(); |
| 800 | return alloc; |
| 801 | } |
| 802 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 803 | |
| 804 | RsAllocation rsaAllocationCreateFromBitmap(RsContext con, RsType vtype, |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 805 | RsAllocationMipmapControl mips, |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 806 | const void *data, uint32_t usages) { |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 807 | Context *rsc = static_cast<Context *>(con); |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 808 | Type *t = static_cast<Type *>(vtype); |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 809 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 810 | RsAllocation vTexAlloc = rsaAllocationCreateTyped(rsc, vtype, mips, usages); |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 811 | Allocation *texAlloc = static_cast<Allocation *>(vTexAlloc); |
| 812 | if (texAlloc == NULL) { |
| 813 | LOGE("Memory allocation failure"); |
| 814 | return NULL; |
| 815 | } |
| 816 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 817 | memcpy(texAlloc->getPtr(), data, t->getDimX() * t->getDimY() * t->getElementSizeBytes()); |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 818 | if (mips == RS_ALLOCATION_MIPMAP_FULL) { |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 819 | Adapter2D adapt(rsc, texAlloc); |
| 820 | Adapter2D adapt2(rsc, texAlloc); |
| 821 | for (uint32_t lod=0; lod < (texAlloc->getType()->getLODCount() -1); lod++) { |
| 822 | adapt.setLOD(lod); |
| 823 | adapt2.setLOD(lod + 1); |
| 824 | mip(adapt2, adapt); |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 825 | } |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 826 | } |
| 827 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 828 | texAlloc->deferedUploadToTexture(rsc); |
Jason Sams | 31a7e42 | 2010-10-26 13:09:17 -0700 | [diff] [blame] | 829 | return texAlloc; |
| 830 | } |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 831 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 832 | RsAllocation rsaAllocationCubeCreateFromBitmap(RsContext con, RsType vtype, |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 833 | RsAllocationMipmapControl mips, |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 834 | const void *data, uint32_t usages) { |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 835 | Context *rsc = static_cast<Context *>(con); |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 836 | Type *t = static_cast<Type *>(vtype); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 837 | |
| 838 | // Cubemap allocation's faces should be Width by Width each. |
| 839 | // Source data should have 6 * Width by Width pixels |
| 840 | // Error checking is done in the java layer |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 841 | RsAllocation vTexAlloc = rsaAllocationCreateTyped(rsc, t, mips, usages); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 842 | Allocation *texAlloc = static_cast<Allocation *>(vTexAlloc); |
| 843 | if (texAlloc == NULL) { |
| 844 | LOGE("Memory allocation failure"); |
| 845 | return NULL; |
| 846 | } |
| 847 | |
| 848 | uint8_t *sourcePtr = (uint8_t*)data; |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 849 | for (uint32_t face = 0; face < 6; face ++) { |
| 850 | Adapter2D faceAdapter(rsc, texAlloc); |
| 851 | faceAdapter.setFace(face); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 852 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 853 | size_t cpySize = t->getDimX() * t->getDimX() * t->getElementSizeBytes(); |
| 854 | memcpy(faceAdapter.getElement(0, 0), sourcePtr, cpySize); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 855 | |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 856 | // Move the data pointer to the next cube face |
| 857 | sourcePtr += cpySize; |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 858 | |
Jason Sams | d4b23b5 | 2010-12-13 15:32:35 -0800 | [diff] [blame] | 859 | if (mips == RS_ALLOCATION_MIPMAP_FULL) { |
Jason Sams | 5476b45 | 2010-12-08 16:14:36 -0800 | [diff] [blame] | 860 | Adapter2D adapt(rsc, texAlloc); |
| 861 | Adapter2D adapt2(rsc, texAlloc); |
| 862 | adapt.setFace(face); |
| 863 | adapt2.setFace(face); |
| 864 | for (uint32_t lod=0; lod < (texAlloc->getType()->getLODCount() -1); lod++) { |
| 865 | adapt.setLOD(lod); |
| 866 | adapt2.setLOD(lod + 1); |
| 867 | mip(adapt2, adapt); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 868 | } |
| 869 | } |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 870 | } |
| 871 | |
Jason Sams | 5e0035a | 2010-12-13 17:11:21 -0800 | [diff] [blame] | 872 | texAlloc->deferedUploadToTexture(rsc); |
Alex Sakhartchouk | 67f2e44 | 2010-11-18 15:22:43 -0800 | [diff] [blame] | 873 | return texAlloc; |
| 874 | } |