AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,171 Commits 1 Branch 0 Tags 544 MiB
2dbd0449bf
Commit Graph

157 Commits

Author SHA1 Message Date
senorblanco@chromium.org
2dbd0449bf Minor fixes to get SampleApp's OpenGL path not to crash on Linux. Initialize 
SkOSWindow::fGLAttched (and fVi while we're at it), since it was being checked
uninitialized.  Don't call has_gl_extension() while initializing the
GrGLDefaultInterface, since it derefs the default interface (which is still
NULL); use has_gl_extension_from_string() instead.

Review URL:  http://codereview.appspot.com/4480041/



git-svn-id: http://skia.googlecode.com/svn/trunk@1242 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-04 15:29:04 +00:00
bsalomon@google.com
4b9b6a20d4 Fix validation (glTexEnvi is fixed pipe only) 
git-svn-id: http://skia.googlecode.com/svn/trunk@1241 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-04 15:01:16 +00:00
bsalomon@google.com
bf2a46941e Add all ES2 glUniform functions to GrGLInterface. Add interface validation for fixed pipe or shader pipe use. 
Review URL: http://codereview.appspot.com/4435082/



git-svn-id: http://skia.googlecode.com/svn/trunk@1234 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-04 12:35:39 +00:00
bsalomon@google.com
05ef510389 Remove GrContext.h dependence on GrGpu.h 
Review URL:  http://codereview.appspot.com/4433096/



git-svn-id: http://skia.googlecode.com/svn/trunk@1227 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-02 21:14:59 +00:00
bsalomon@google.com
8295dc1474 4x4 SSAA with improvements in determination of when to apply. Still disabled at compile time. 
Review URL: http://codereview.appspot.com/4445075/




git-svn-id: http://skia.googlecode.com/svn/trunk@1218 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-05-02 12:53:34 +00:00
junov@google.com
c97db4c40b Fixing a simple build error in GrGpuGLShaders.cpp with GR_AGGRESSIVE_SHADER_OPTS 
git-svn-id: http://skia.googlecode.com/svn/trunk@1216 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-29 17:25:42 +00:00
bsalomon@google.com
d5d10494e3 Only define debugging GL globals when the code paths are enabled 
git-svn-id: http://skia.googlecode.com/svn/trunk@1212 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-28 21:16:31 +00:00
bsalomon@google.com
eaf6a5daf4 Make reserveAndLockGeometry set index/vertex ptr to null if none requested. We are expecting this behavior in a caller and it seems reasonable. 
git-svn-id: http://skia.googlecode.com/svn/trunk@1210 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-28 19:22:57 +00:00
bsalomon@google.com
6a77cc5dde Fix warnings. 
git-svn-id: http://skia.googlecode.com/svn/trunk@1209 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-28 17:33:34 +00:00
agl@chromium.org
83747252b8 Adding newline at end of file to fix compiler error. 
Unreviewed, build fix.


git-svn-id: http://skia.googlecode.com/svn/trunk@1206 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-27 23:11:21 +00:00
bsalomon@google.com
06e1795cd9 Add bounding rect for paths 
Review URL: http://codereview.appspot.com/4442094/



git-svn-id: http://skia.googlecode.com/svn/trunk@1205 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-27 21:13:04 +00:00
bsalomon@google.com
6aa25c3f55 Make Gr clear take a rect for a partial-clear 
Review URL: http://codereview.appspot.com/4442093/



git-svn-id: http://skia.googlecode.com/svn/trunk@1203 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-27 19:55:29 +00:00
bsalomon@google.com
a47a48dca5 SSSA for drawVerts, cleanup determination of when stage is enabled 
Review URL: http://codereview.appspot.com/4430066/



git-svn-id: http://skia.googlecode.com/svn/trunk@1195 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 20:22:11 +00:00
bsalomon@google.com
48ba56d5fa Update GR_API to support non-Windows DLLs. 
Review URL: http://codereview.appspot.com/4441067/



git-svn-id: http://skia.googlecode.com/svn/trunk@1189 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 17:59:32 +00:00
bsalomon@google.com
06afe7b5a1 Per-draw super sampling. Disabled, path only, 2x2 only 
Review URL: http://codereview.appspot.com/4452048/



git-svn-id: http://skia.googlecode.com/svn/trunk@1186 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 15:31:40 +00:00
bsalomon@google.com
898d9e5dc6 Fix signed/unsigned warning in GrInOrderDrawBuffer.cpp 
git-svn-id: http://skia.googlecode.com/svn/trunk@1182 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 13:22:33 +00:00
bsalomon@google.com
a39f404c87 Remove sampler state param from lockKeylessTexture. It didn't serve any function and gave the false impression that tiling modes were handled on APIs with npot limitations. 
http://codereview.appspot.com/4444061/



git-svn-id: http://skia.googlecode.com/svn/trunk@1181 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-26 13:18:16 +00:00
bsalomon@google.com
0b335c1ac1 Make clear a GrDrawTarget virtual method and implement in GrInOrderDrawBuffer 
Review URL: http://codereview.appspot.com/4442081/



git-svn-id: http://skia.googlecode.com/svn/trunk@1176 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-25 19:17:44 +00:00
bsalomon@google.com
4711a7ae95 Remove unnecessary BindBuffers. These were needed when we used vertex arrays. Now we always use buffer objects. 
git-svn-id: http://skia.googlecode.com/svn/trunk@1173 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-25 18:02:58 +00:00
bsalomon@google.com
fea37b5e53 Add lockKeylessTexture() for caching texture without a content key. 
Review URL: http://codereview.appspot.com/4440065/




git-svn-id: http://skia.googlecode.com/svn/trunk@1172 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-25 15:51:06 +00:00
bsalomon@google.com
205d46067a Move alpha-ramp AA to GrContext, detect cases when AA is applied via other methods (smooth lines, MSAA) or rect falls on integer coords and skip the alpha ramp path. Use pre-fab index buffer for alpha-ramped fill rects and stroke rects. 
Review URL: http://codereview.appspot.com/4449047/

git-svn-id: http://skia.googlecode.com/svn/trunk@1169 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-25 12:43:45 +00:00
bsalomon@google.com
e624caf6c3 Fix copy/paste bug that causes stage 0 sample mode to be used for all stages 
git-svn-id: http://skia.googlecode.com/svn/trunk@1168 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-22 19:22:58 +00:00
bsalomon@google.com
a55847ba22 Fix alignment issues with stack allocated memory allocated as bytes but used to hold other types. 
Review URL: http://codereview.appspot.com/4435060/



git-svn-id: http://skia.googlecode.com/svn/trunk@1162 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-20 15:47:04 +00:00
bsalomon@google.com
9dbdb4068f Fix mask from change r1155. (I blame the mistake on skipping afternoon coffee :)) 
git-svn-id: http://skia.googlecode.com/svn/trunk@1161 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-20 13:01:29 +00:00
bsalomon@google.com
4be283f3a8 Adds a build flag for GL to never use vertex attributes that don't have per-vertex values. 
Also promotes the ATTRIBUTE_MATRIX flag that was local to cpp files to the public config file.

Review URL: http://codereview.appspot.com/4434057/

git-svn-id: http://skia.googlecode.com/svn/trunk@1155 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-19 21:15:09 +00:00
reed@google.com
34cec2416c remove static from template functions 
http://codereview.appspot.com/4437055/



git-svn-id: http://skia.googlecode.com/svn/trunk@1151 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-19 15:53:12 +00:00
bsalomon@google.com
8b484419e8 Suppress warnings in GrBufferAllocPool 
git-svn-id: http://skia.googlecode.com/svn/trunk@1148 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-18 19:07:44 +00:00
ctguil@chromium.org
d5683e2caa Add newline to GrStencil.cpp to prevent warning. 
Review URL: http://codereview.appspot.com/4442061

git-svn-id: http://skia.googlecode.com/svn/trunk@1146 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-18 18:12:50 +00:00
Scroggo
9df214e836 http://codereview.appspot.com/4373057/ 
git-svn-id: http://skia.googlecode.com/svn/trunk@1135 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-15 14:48:08 +00:00
bsalomon@google.com
398109cc3e rename SkDevice::eraseColor to clear and make virtual. 
Properly flush in GrContext before calling GrGpu::clear()

Review URL: http://codereview.appspot.com/4419043/



git-svn-id: http://skia.googlecode.com/svn/trunk@1130 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-14 18:40:27 +00:00
bsalomon@google.com
9ccdb95319 NO_ERROR version of GR_GL macro shouldn't call check errror 
git-svn-id: http://skia.googlecode.com/svn/trunk@1128 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-14 17:43:23 +00:00
bsalomon@google.com
399d454be9 test of writable Skia tree in a chrome tree. 
(removed an extra newline from FlingState.h)



git-svn-id: http://skia.googlecode.com/svn/trunk@1122 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-13 21:28:23 +00:00
bsalomon@google.com
bcdbbe61e1 rename XHelper members to onX 
Review URL: http://codereview.appspot.com/4380056/



git-svn-id: http://skia.googlecode.com/svn/trunk@1113 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-12 15:40:00 +00:00
bsalomon@google.com
13a950ae4e Use has_gl_extension_from_string in GrGLDefaultInterface_win.cpp (before the GL iface is installed). 
git-svn-id: http://skia.googlecode.com/svn/trunk@1112 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-12 14:16:21 +00:00
bsalomon@google.com
7aaee005fa Use min of max_texture and max_renderbuffer size when calling fbo_test 
git-svn-id: http://skia.googlecode.com/svn/trunk@1110 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-11 19:54:04 +00:00
bsalomon@google.com
5877ffd5ea Add APIs and plumbing for external rendertaret-textures w/ and w/out MSAA. 
Review URL: http://codereview.appspot.com/4388049/



git-svn-id: http://skia.googlecode.com/svn/trunk@1102 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-11 17:58:48 +00:00
bsalomon@google.com
9283b583ab Always bind packed depth stencil formats to both attacment points 
Review URL: http://codereview.appspot.com/4372048/



git-svn-id: http://skia.googlecode.com/svn/trunk@1087 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-08 19:00:04 +00:00
bsalomon@google.com
0650e811b5 fix use of smooth lines 
Review URL:http://codereview.appspot.com/4370050/


git-svn-id: http://skia.googlecode.com/svn/trunk@1085 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-08 18:07:53 +00:00
twiz@google.com
f236d16914 During ganesh tear-down, it may be the case that the vertex and index buffers 
are those currently bound to the HW geometry state.  We should not assert under
these conditions.

Review:  http://codereview.appspot.com/4365046/



git-svn-id: http://skia.googlecode.com/svn/trunk@1076 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-07 15:57:12 +00:00
bsalomon@google.com
f954d8dd9a Add isMultisampled() to GrRenderTarget. Cleanup MSAA vs smooth lines logic in GrGpuGL. 
Skia issue: 178

Review URL: http://codereview.appspot.com/4382041/



git-svn-id: http://skia.googlecode.com/svn/trunk@1067 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-06 17:50:02 +00:00
bsalomon@google.com
6dcf499d35 Fix dangling ptr when GrRenderTarget outlives its GrTexture representation 
Move management of fRenderTarget ptr from GL texture class to base class

Minor:
Remove redundant GrContext-per-frame debug code in SampleApp.cpp
Add GrTexture.cpp to legacy VS2010 vcxproj

Review URL: http://codereview.appspot.com/4352051/



git-svn-id: http://skia.googlecode.com/svn/trunk@1061 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-05 21:16:14 +00:00
reed@google.com
f81401763e add rect.inset(dx, dy) 
git-svn-id: http://skia.googlecode.com/svn/trunk@1058 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-05 20:05:56 +00:00
bsalomon@google.com
3eb291455c Add GrTexture.cpp to legacy project files 
git-svn-id: http://skia.googlecode.com/svn/trunk@1057 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-05 17:49:49 +00:00
bsalomon@google.com
669fdc4ed8 Adds read pixels to GrTexture and GrRenderTarget 
Adds SkGrRenderTargetPixelRef for SkBitmaps that are backed by RTs that aren't textures.
Adds onReadPixels implementations for SkGr pixel ref types



git-svn-id: http://skia.googlecode.com/svn/trunk@1056 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-05 17:08:27 +00:00
reed@google.com
0ebe81a2b7 always flush accumulated draws before we purge the font cache 
git-svn-id: http://skia.googlecode.com/svn/trunk@1051 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-04 20:06:59 +00:00
bsalomon@google.com
67dc548cec export GrDefaultPathRenderer/GrPathRenderer 
Review URL: http://codereview.appspot.com/4357050/



git-svn-id: http://skia.googlecode.com/svn/trunk@1048 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-04 18:45:32 +00:00
reed@google.com
5e76223ca7 move trimStorage to outer scope, so its memory is still valid later on when 
we reference the newly assigned src pixels.



git-svn-id: http://skia.googlecode.com/svn/trunk@1046 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-04 18:15:49 +00:00
bsalomon@google.com
f987d1b234 Remove dependence on platform GL headers. Remove code that attempts to infer GL function pointers on various platforms. Instead add platform-specific implementations for Windows and Mac. (GLX coming) 
Review URL: http://codereview.appspot.com/4354048/

git-svn-id: http://skia.googlecode.com/svn/trunk@1045 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-04 17:13:52 +00:00
bsalomon@google.com
beccee78bb fix mac build of gr unit test 
Review URL: http://codereview.appspot.com/4351042/



git-svn-id: http://skia.googlecode.com/svn/trunk@1034 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-04-01 14:51:07 +00:00
junov@google.com
f93e717c7f Refactoring the GrGpuGLShaders2 into 2 classes: GrGpuGLShaders 
and GrGLProgram.  The change also contains stubs and placeholders for GrEffect
(work in progress), which will extend shader and rendering capabilities in
Ganesh.  The hash keys for the program cache table have been modified to be able
to accomodate variable-length keys, which will be required for GrEffect support.

Code review: http://codereview.appspot.com/4309045/



git-svn-id: http://skia.googlecode.com/svn/trunk@1031 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-03-31 21:26:24 +00:00