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

202 Commits

Author SHA1 Message Date
bsalomon@google.com
4d06214caf Change GrGLVersion from typedef GrFixed to uint32_t 
Review URL: http://codereview.appspot.com/5097044


git-svn-id: http://skia.googlecode.com/svn/trunk@2309 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-22 14:31:24 +00:00
bsalomon@google.com
c82b8899d9 Cleanup handling of GL versions, fix function names 
Review URL: http://codereview.appspot.com/5097044/



git-svn-id: http://skia.googlecode.com/svn/trunk@2308 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-22 14:10:33 +00:00
bsalomon@google.com
bc5cf51627 Use BindFragDataLocation (rather than indexed variant) for FS color output. 
Review URL: http://codereview.appspot.com/5098042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2299 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-09-21 16:21:07 +00:00
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
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
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
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
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
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
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
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
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
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
bsalomon@google.com
c287a89fdd Include GrRenderTarget.h in GrContext.h to unblock skia roll due to WK dependency on this include 
Review URL: http://codereview.appspot.com/4927041/


git-svn-id: http://skia.googlecode.com/svn/trunk@2141 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-19 14:49:36 +00:00
bsalomon@google.com
0b77d6892b Make GrGLInterface a per-GrContext refcounted object rather than a global 
Review URL: http://codereview.appspot.com/4901046/



git-svn-id: http://skia.googlecode.com/svn/trunk@2140 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-19 13:28:54 +00:00
bsalomon@google.com
583a1e3850 Fixed r2125. Identical change but also moves GrTesselatedPathRenderer.h to src dir. 
Verbal SGTM from Tom who reviewed the original version at: http://codereview.appspot.com/4894050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2129 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-17 13:42:46 +00:00
vandebo@chromium.org
b4f4c02eff Revert "Make GrDrawTarget.h and GrPathRenderer.h be private headers" 
This reverts commit r2125

Looks like GrPathRenderer.h is used from gpu/include/GrTesselatedPathRenderer.h

There also seems to be a dependency tracking problem, because r2125 didn't go red, but the next revision did.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@2127 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-16 23:20:31 +00:00
bsalomon@google.com
8b4a64d318 Make GrDrawTarget.h and GrPathRenderer.h be private headers 
Review URL: http://codereview.appspot.com/4894050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2125 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-16 20:38:11 +00:00
bsalomon@google.com
498776ad9f Remove GrContext::drawCustomVertices 
Review URL: http://codereview.appspot.com/4910042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2124 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-16 19:20:44 +00:00
bsalomon@google.com
4d3aaafd90 Move some gpu headers out of the public include dir 
Review URL: http://codereview.appspot.com/4902045/




git-svn-id: http://skia.googlecode.com/svn/trunk@2119 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-16 15:09:46 +00:00
bsalomon@google.com
558a75bcb3 Use a single stencil buffer for a given width,height,samplecount 
Review URL: http://codereview.appspot.com/4854044/


git-svn-id: http://skia.googlecode.com/svn/trunk@2061 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-08 17:01:14 +00:00
bsalomon@google.com
0168afc719 Make RT & TEX base classes aware of NPOT/min-RT bloated size 
Review URL: http://codereview.appspot.com/4849045/


git-svn-id: http://skia.googlecode.com/svn/trunk@2057 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-08 13:21:05 +00:00
bsalomon@google.com
6513cd06ae Fail draws when can't get geom into vb/ib. 
Review URL: http://codereview.appspot.com/4837059/



git-svn-id: http://skia.googlecode.com/svn/trunk@2053 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-05 20:12:30 +00:00
bsalomon@google.com
edc177df61 Fixes for iOS / Ganesh (consistent fs/vs uni precision decl and don't use stencil-only fbo for clear) 
Review URL: http://codereview.appspot.com/4850043/


git-svn-id: http://skia.googlecode.com/svn/trunk@2050 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-05 15:46:40 +00:00
bsalomon@google.com
81c3f8de1c Add GrStencilBuffer as a separate resource type from render target 
This is a resubmission of the changes in r2026 with fixes for FBO completeness issues.

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


git-svn-id: http://skia.googlecode.com/svn/trunk@2035 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-03 15:18:33 +00:00
bsalomon@google.com
c49d66b04e Add glReadBuffer to GrGLInterface. 
Review URL: http://codereview.appspot.com/4841048/





git-svn-id: http://skia.googlecode.com/svn/trunk@2034 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-03 14:22:30 +00:00
bsalomon@google.com
d32c5f564e Add glDrawBuffer(s) to GrGLInterface 
Review URL: http://codereview.appspot.com/4841046/



git-svn-id: http://skia.googlecode.com/svn/trunk@2032 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-02 19:29:03 +00:00
bsalomon@google.com
4043ae2061 Revert r2026 due to bot failures 
git-svn-id: http://skia.googlecode.com/svn/trunk@2027 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-02 14:19:11 +00:00
bsalomon@google.com
a16d6506bd Create a separate GrStencilBuffer class apart from GrRenderTarget. 
Review URL: http://codereview.appspot.com/4837046/



git-svn-id: http://skia.googlecode.com/svn/trunk@2026 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-02 14:07:52 +00:00
yangsu@google.com
e938b19445 iOS SampleApp menu related changes 
git-svn-id: http://skia.googlecode.com/svn/trunk@2023 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-02 13:23:15 +00:00
bsalomon@google.com
030302ce69 Fix comment alignment 
git-svn-id: http://skia.googlecode.com/svn/trunk@2014 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-01 17:35:01 +00:00
bsalomon@google.com
dea2f8d863 Remove unnecessary dirty clip flag in GrGpu, remove getUsableStencilBits() 
Review URL: http://codereview.appspot.com/4828050/



git-svn-id: http://skia.googlecode.com/svn/trunk@2011 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-01 15:51:05 +00:00
bsalomon@google.com
5bfc21761e cleanup GrGLTexture / GrGLRenderTarget cons. Make GrRenderTarget aware of its msaa sample count. 
Review URL: http://codereview.appspot.com/4833045/



git-svn-id: http://skia.googlecode.com/svn/trunk@1996 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-29 20:29:05 +00:00
bsalomon@google.com
aa5b6730f2 move render target decls / defs to their own headers / srcs 
Review URL: http://codereview.appspot.com/4806058/



git-svn-id: http://skia.googlecode.com/svn/trunk@1995 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-29 15:13:20 +00:00
bsalomon@google.com
e14490adad Move GL headers out of public include dir 
Review URL: http://codereview.appspot.com/4837041/



git-svn-id: http://skia.googlecode.com/svn/trunk@1992 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-29 13:39:53 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms. 
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-28 14:26:00 +00:00
bsalomon@google.com
50398bf7f1 Make GrTextureCache into a generic GrResource cache. Also some GrContext texture interface cleanup. 
http://codereview.appspot.com/4815055/


git-svn-id: http://skia.googlecode.com/svn/trunk@1965 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-26 20:45:30 +00:00
bsalomon@google.com
cee661af92 Reapply r1951. 
git-svn-id: http://skia.googlecode.com/svn/trunk@1959 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-26 12:32:36 +00:00
vandebo@chromium.org
ec36471096 Revert "Add sizeInBytes to GrResource, make GrRenderTarget aware of its pixel config (r1951)" 
Temporarily revert this change in order to roll other changes into Chrome.

TBR=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@1958 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-26 03:44:05 +00:00
bsalomon@google.com
aab1fd921c Add sizeInBytes to GrResource, make GrRenderTarget aware of its pixel config 
Review URL: http://codereview.appspot.com/4802058/



git-svn-id: http://skia.googlecode.com/svn/trunk@1951 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-25 17:41:12 +00:00
reed@google.com
970cb5597a convolve GrRefCnt and SkRefCnt 
git-svn-id: http://skia.googlecode.com/svn/trunk@1873 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-15 15:52:28 +00:00