Commit Graph

364 Commits

Author SHA1 Message Date
bsalomon@google.com
4fa6694c58 Resubmit 2289 with fix for glsl version
git-svn-id: http://skia.googlecode.com/svn/trunk@2291 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-20 19:06:12 +00:00
bsalomon@google.com
1fac5ca505 Revert 2289. GLSL version detection not robust enough. May think we don't have GLSL 1.50 support based on OpenGL version. We have to look at the available extensions, not just GL version.
git-svn-id: http://skia.googlecode.com/svn/trunk@2290 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-20 17:57:44 +00:00
bsalomon@google.com
98874cdda0 [GPU] Use new Var type for inputs/outputs of FS and VS
Review URL: http://codereview.appspot.com/5056048/



git-svn-id: http://skia.googlecode.com/svn/trunk@2289 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-20 17:33:24 +00:00
bsalomon@google.com
3ad3d44f15 Include GrGLInterface.h instead of forward declaring, since we have to get NULL defined anyway.
git-svn-id: http://skia.googlecode.com/svn/trunk@2280 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-16 21:34:29 +00:00
bsalomon@google.com
30ee1b5c23 Fix forward decl
git-svn-id: http://skia.googlecode.com/svn/trunk@2279 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-16 21:20:24 +00:00
bsalomon@google.com
15b11df63f Make GrGpuGL release its resources before GrGLInterface is released.
Forward declare GrGLInterface in GrGLDefaultInterface_none file

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


git-svn-id: http://skia.googlecode.com/svn/trunk@2278 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-16 21:18:29 +00:00
seanpaul@google.com
d4f299e496 Fix some mac compilation errors generated when building utils within
chrome.

BUG=364
TEST=Build skia on mac, ran bench. Ensured both behaved as expected.
Review URL: http://codereview.appspot.com/5032045

git-svn-id: http://skia.googlecode.com/svn/trunk@2277 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-16 20:46:40 +00:00
bsalomon@google.com
6fb736fc2e Simplify specification of default interface
Review URL: http://codereview.appspot.com/5036045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2276 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-16 18:51:57 +00:00
bsalomon@google.com
6087975e5d Fix assertions in GrResourceCache::removeAll, don't reattached invalidated resources
Review URL: http://codereview.appspot.com/5000048/



git-svn-id: http://skia.googlecode.com/svn/trunk@2272 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-15 20:43:53 +00:00
bsalomon@google.com
661056739c Move edgeAA shader gen code to its own function
Review URL:  http://codereview.appspot.com/5015048/


git-svn-id: http://skia.googlecode.com/svn/trunk@2271 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-15 15:12:00 +00:00
bsalomon@google.com
ba72f042f6 enable OES derivatives extension in shaders that use it
Review URL:  http://codereview.appspot.com/5023043/



git-svn-id: http://skia.googlecode.com/svn/trunk@2269 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-14 18:05:30 +00:00
bsalomon@google.com
79afcaa25a Workaround crash in cmd buffer validation code when GL shaders/programs fail
Review URL: http://codereview.appspot.com/5012046/



git-svn-id: http://skia.googlecode.com/svn/trunk@2267 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-14 14:29:18 +00:00
bsalomon@google.com
49313f6b43 GrTArray->SkTArray & docs
Review URL: http://codereview.appspot.com/5005045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2265 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-14 13:54:05 +00:00
bsalomon@google.com
da13aaec5b Remove unnecessary forward decl that was causing a warning.
git-svn-id: http://skia.googlecode.com/svn/trunk@2264 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-14 12:52:28 +00:00
bsalomon@google.com
a996fec404 Use push_back_n() in place of multiple push_back()s
Review URL: http://codereview.appspot.com/5018041/


git-svn-id: http://skia.googlecode.com/svn/trunk@2260 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-13 18:49:13 +00:00
bsalomon@google.com
8c2fe99ed2 Fix some issues in gpu device with perspective. Add a gm that would have caught them.
Review URL: http://codereview.appspot.com/4994048/



git-svn-id: http://skia.googlecode.com/svn/trunk@2256 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-13 15:27:18 +00:00
bsalomon@google.com
dbeeac3332 Add perspective support to the gpu aa hairline renderer.
Review URL: http://codereview.appspot.com/4969071/



git-svn-id: http://skia.googlecode.com/svn/trunk@2249 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-12 14:59:34 +00:00
bsalomon@google.com
27c9b6d276 Add operator = to GrPaint
Review URL: http://codereview.appspot.com/4997045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2248 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-12 14:30:27 +00:00
bsalomon@google.com
4f83be8f86 Fix GrContext::drawPaint with perspective, also never apply AA
Review URL: http://codereview.appspot.com/4969074/


git-svn-id: http://skia.googlecode.com/svn/trunk@2247 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-12 13:52:51 +00:00
bsalomon@google.com
383963280d [gpu] Remove getMaxStretch for perspective, use mapRadius for perspective path subdiv tol, add test
Review URL: http://codereview.appspot.com/4975063/



git-svn-id: http://skia.googlecode.com/svn/trunk@2246 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-09 19:32:04 +00:00
bsalomon@google.com
181e9bd948 Improve gpu path subdiv with perspective, remove tolerance scale, fix comment
Review URL: http://codereview.appspot.com/4993041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2239 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-07 18:42:30 +00:00
bsalomon@google.com
46a2a1ee46 Make gpu hairline check for degenerate quad more robust
Review URL: http://codereview.appspot.com/4956067/



git-svn-id: http://skia.googlecode.com/svn/trunk@2232 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-06 22:10:52 +00:00
bsalomon@google.com
6defc04c30 Fix bitrot in GrGLDefaultInterface_android.cpp
Review URL: http://codereview.appspot.com/4960056/



git-svn-id: http://skia.googlecode.com/svn/trunk@2231 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-06 21:04:36 +00:00
bsalomon@google.com
dca4aabd89 Make GL calls go through macro (and therefore trigger callback function if present)
Review URL: http://codereview.appspot.com/4986043/


git-svn-id: http://skia.googlecode.com/svn/trunk@2223 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-06 19:05:24 +00:00
bsalomon@google.com
7d4679a2e1 Rename existing nonpreserving reallocs to reset, add reset to SkAutoMalloc, use reset in GrBufferAllocPool
Review URL: http://codereview.appspot.com/4951058/


git-svn-id: http://skia.googlecode.com/svn/trunk@2215 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-02 22:06:24 +00:00
bsalomon@google.com
973b879dfd Remove unneeded #define
Review URL: http://codereview.appspot.com/4973053/


git-svn-id: http://skia.googlecode.com/svn/trunk@2213 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-02 17:28:06 +00:00
bsalomon@google.com
e174ea4bb1 Fix some warnings when including some Skia headers in Chromium code under VS2008.
Review URL: http://codereview.appspot.com/4956058/



git-svn-id: http://skia.googlecode.com/svn/trunk@2209 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-01 15:34:14 +00:00
bsalomon@google.com
56bfc5acc2 Add optional per-gl-func client callback.
Review URL: http://codereview.appspot.com/4964055/



git-svn-id: http://skia.googlecode.com/svn/trunk@2207 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-01 13:28:16 +00:00
bsalomon@google.com
87fcfe0654 Compile option to perform GL logging by default debug.
Review URL: http://codereview.appspot.com/4964054/



git-svn-id: http://skia.googlecode.com/svn/trunk@2205 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-31 13:41:51 +00:00
bsalomon@google.com
9b09c9e91c Abort AA rect path when index buffer allocation fails
Review URL http://codereview.appspot.com/4984041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2204 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-31 13:33:40 +00:00
bsalomon@google.com
fcb0dbc0ab Fix GrAAHairLinePathRenderer fixed pt build
git-svn-id: http://skia.googlecode.com/svn/trunk@2199 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 18:35:18 +00:00
bsalomon@google.com
aeb2160b1d Add GrAAHairLinePathRenderer
Review URL: http://codereview.appspot.com/4926045



git-svn-id: http://skia.googlecode.com/svn/trunk@2196 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 18:13:44 +00:00
bsalomon@google.com
dec9f2d351 Fix multi-line macro by adding line continuation.
git-svn-id: http://skia.googlecode.com/svn/trunk@2195 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 18:05:17 +00:00
yangsu@google.com
69f2e05b58 Updated iOS SampleApp and the simple hello world Skia Cocoa App under experimental
git-svn-id: http://skia.googlecode.com/svn/trunk@2194 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 17:08:08 +00:00
tomhudson@google.com
dd5f7442f6 Add SkMatrix::getPerspectiveTypeMaskOnly() and SkMatrix::isTriviallyIdentity().
Reduces profile time in setConcat() and computeTypeMask() for demos that
do a lot of matrix concatenation.



git-svn-id: http://skia.googlecode.com/svn/trunk@2191 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-30 15:13:55 +00:00
senorblanco@chromium.org
7ccf460bb5 [committed on behalf of dmaclach@chromium.org.]
Add newline at end of file to get rid of warnings compiling Chromium on
the Mac.  Chromium build wants newline at end of files.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@2188 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-29 21:45:23 +00:00
bsalomon@google.com
ab3dee5c8a Fix GPU assumption that clipstack begins with intersect or replace.
Review URL: http://codereview.appspot.com/4977043/



git-svn-id: http://skia.googlecode.com/svn/trunk@2183 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-29 15:18:41 +00:00
epoger@google.com
17b7894609 rolling back the experimental rollbacks in r2178-2179
git-svn-id: http://skia.googlecode.com/svn/trunk@2180 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-26 14:40:38 +00:00
epoger@google.com
5f226572b3 rolling tree back to its state as of r2169 to see if that fixes Windows buildbots
git-svn-id: http://skia.googlecode.com/svn/trunk@2179 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-26 14:27:59 +00:00
tomhudson@google.com
fa510413c1 Experimental revert of 2170 to see if the buildbot issues are somehow related.
git-svn-id: http://skia.googlecode.com/svn/trunk@2178 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-26 13:19:39 +00:00
bsalomon@google.com
3a9eaeccb0 Don't intersect clipstack with root device bounds
Review URL: Don't intersect clipstack with root device bounds



git-svn-id: http://skia.googlecode.com/svn/trunk@2175 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-25 21:12:57 +00:00
tomhudson@google.com
513909f9a2 Remove compiler warnings (Linux clang, mostly).
Fix indentation.
Remove unnecessary virtual destructor.
codereview.appspot.com/4965043/



git-svn-id: http://skia.googlecode.com/svn/trunk@2171 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-25 15:50:54 +00:00
tomhudson@google.com
32992605aa Remove compiler warnings (gcc on Linux).
codereview.appspot.com/4922052/



git-svn-id: http://skia.googlecode.com/svn/trunk@2170 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-25 15:37:03 +00:00
bsalomon@google.com
1f221a7021 More prep work in Gr for landing AA hairline renderer.
Review URL: http://codereview.appspot.com/4944045



git-svn-id: http://skia.googlecode.com/svn/trunk@2164 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-23 20:54:07 +00:00
bsalomon@google.com
471d471dcd Correctly determine whether HW AA lines can be used
Review URL: http://codereview.appspot.com/4937049/



git-svn-id: http://skia.googlecode.com/svn/trunk@2162 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-23 15:45:25 +00:00
bsalomon@google.com
8214587a79 Exit early from 0 prim draws in GrDrawTarget
Review URL: http://codereview.appspot.com/4929045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2159 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-23 14:32:40 +00:00
bsalomon@google.com
e9a98942b4 Fix GrResourceCache::removeAll when one resource holds a lock on another
Review URL: http://codereview.appspot.com/4929042/


git-svn-id: http://skia.googlecode.com/svn/trunk@2147 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-22 17:06:16 +00:00
bsalomon@google.com
971d0c8049 Get rid of createRenderTargetFrom3DAPIState and associated glGets necessary to support it.
Review URL: http://codereview.appspot.com/4928041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2144 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-19 17:22:05 +00:00
bsalomon@google.com
3008519e9f Use a prioritized list of path renderers in Gr.
http://codereview.appspot.com/4867058



git-svn-id: http://skia.googlecode.com/svn/trunk@2143 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-19 15:42:31 +00:00
bsalomon@google.com
b095140596 Change GrSafeUnref / GrSafeRef from static inlines to #defines. Chrome buid is choking on defined but not use warnings.
Review URL: http://codereview.appspot.com/4929041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2142 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-19 15:37:34 +00:00