Split texture update out from onCreateTexture

[bsalomon, 2011-07-29 20:53:26]

Last one for today, promise! :)

(The change for testing samples > 1 to > 0 reflects the fact that technicallly
you can have a msaa buffer with 1 sample per pixel and it behaves slightly
differently than a non-msaa buffer)

[TomH, 2011-07-29 21:07:27]

http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp
File gpu/src/GrGpuGL.cpp (right):

http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp#newcode912
gpu/src/GrGpuGL.cpp:912: SkAutoSMalloc<128 * 128> tempStorage;
Can we move this into the if (data && (trimRowBytes < rowBytes || flipY)) so
it's only allocated if it's needed?

http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp#newcode945
gpu/src/GrGpuGL.cpp:945: // now point srcData to our trimmed version
fix comment - srcData was renamed to data

http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp#newcode1152
gpu/src/GrGpuGL.cpp:1152: return return_null_texture();
Right now allocateAndUploadTexData() always returns true?

[bsalomon, 2011-07-29 21:16:29]

On 2011/07/29 21:07:27, TomH wrote:
> http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp#newcode912
> gpu/src/GrGpuGL.cpp:912: SkAutoSMalloc<128 * 128> tempStorage;
> Can we move this into the if (data && (trimRowBytes < rowBytes || flipY)) so
> it's only allocated if it's needed?
 
The initial allocation is just a stack push. Heap allocation (if > 1K) only
happens if realloc is called in the if.

> 
> http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp#newcode945
> gpu/src/GrGpuGL.cpp:945: // now point srcData to our trimmed version
> fix comment - srcData was renamed to data
> 

Done (and a few other instances)

>
http://codereview.appspot.com/4809060/diff/2001/gpu/src/GrGpuGL.cpp#newcode1152
> gpu/src/GrGpuGL.cpp:1152: return return_null_texture();
> Right now allocateAndUploadTexData() always returns true?

Duh, nice catch. Made it void.

[TomH, 2011-08-01 13:27:41]

LGTM

[bsalomon, 2011-08-01 13:36:15]

Closed with r2003.