Commit Graph

72 Commits

Author SHA1 Message Date
tomhudson@google.com
f9ad8867f2 Extract ShaderCodeSegments from GrGLProgram into a new class,
GrGLShaderBuilder. Begin populating its interface.

Requires gyp changes.

http://codereview.appspot.com/6197076/



git-svn-id: http://skia.googlecode.com/svn/trunk@3916 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-11 20:38:48 +00:00
bsalomon@google.com
7ffe6810c6 Remove tesselated path renderer and supporting code, glu, and libtess target
Review URL: http://codereview.appspot.com/6197075/



git-svn-id: http://skia.googlecode.com/svn/trunk@3912 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-11 17:32:43 +00:00
tomhudson@google.com
d8f856c32b Move convolution from code in GrGLProgram to new GrConvolutionEffect
class. This is the first test of the new Ganesh shader pipeline.

Also includes some cleanup of the gpu.gyp file: added src/gpu, allowing
us to remove ../ from many #include directives.

http://codereview.appspot.com/6199053/



git-svn-id: http://skia.googlecode.com/svn/trunk@3887 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-10 12:13:36 +00:00
bsalomon@google.com
637d5e9297 Move GL function prototype typdefs to a separate header
Review URL: http://codereview.appspot.com/6189054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3864 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 21:33:56 +00:00
bsalomon@google.com
91bcc94e87 Make GrGLDefines.h be a private header
Review URL: http://codereview.appspot.com/6198048/



git-svn-id: http://skia.googlecode.com/svn/trunk@3851 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 17:28:41 +00:00
bsalomon@google.com
9c1f1ac5d3 Move function decls and macros out of public headers that are meant for internal use.
git-svn-id: http://skia.googlecode.com/svn/trunk@3849 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 17:09:37 +00:00
robertphillips@google.com
7c2578d392 Second half of refactoring to move SW path rendering to GrPathRenderer
http://codereview.appspot.com/6125046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3804 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 12:19:34 +00:00
bsalomon@google.com
8d033a1b12 Remove GrPath typedef
Review URL: http://codereview.appspot.com/6128045/



git-svn-id: http://skia.googlecode.com/svn/trunk@3780 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-27 15:52:53 +00:00
tomhudson@google.com
07eecdca3e Hooks up the GrCustomStage/GrGLProgramStageFactory/GrGLProgramStage
classes from r3726 so they can be used. Does not implement any actual
effect stages.

Has one large known bug: if custom stages are provided, GrSamplerState
comparisons will break; this should preserve correct drawing, but decrease
performance - among other things, we'll break draw batching. To fix this
we'll need a RTTI system for GrCustomState objects, and we'll need to change
the GrSamplerState comparison from a memcmp to something that also does a
deep type-sensitive compare of any GrCustomState objects present.

http://codereview.appspot.com/6074043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3742 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-20 18:35:38 +00:00
bsalomon@google.com
7361f54294 Make GM able to run MSAA modes and multiple GPU configs in a single run.
Review URL: http://codereview.appspot.com/6061051/



git-svn-id: http://skia.googlecode.com/svn/trunk@3734 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-19 19:15:35 +00:00
tomhudson@google.com
168e63418c Infrastructure for new Ganesh shader pipeline: base classes for GPU
implementation of user-defined effects.

http://codereview.appspot.com/6052047/



git-svn-id: http://skia.googlecode.com/svn/trunk@3726 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-18 17:49:20 +00:00
robertphillips@google.com
1e945b7e70 Minor refactoring to pull GrClipMaskManager into its own files
http://codereview.appspot.com/5978055/



git-svn-id: http://skia.googlecode.com/svn/trunk@3697 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 18:03:03 +00:00
robertphillips@google.com
0dd84a399a Minor code cleanup of Debug GL Interface
http://codereview.appspot.com/6032043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3690 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 16:24:35 +00:00
robertphillips@google.com
dd743fefad Initial split up of Debug Interface into separate files
http://codereview.appspot.com/5979048/



git-svn-id: http://skia.googlecode.com/svn/trunk@3616 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 14:40:53 +00:00
robertphillips@google.com
021bce94a3 Delivering .gyp files to enable building & linking w/ ANGLE on Windows
http://codereview.appspot.com/5933057/



git-svn-id: http://skia.googlecode.com/svn/trunk@3580 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 20:42:26 +00:00
bungeman@google.com
5a64e58ebb Revert 3538.
git-svn-id: http://skia.googlecode.com/svn/trunk@3539 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 14:51:56 +00:00
bungeman@google.com
29b63dc863 Correct dependencies in gyp files.
http://codereview.appspot.com/5934044/


git-svn-id: http://skia.googlecode.com/svn/trunk@3538 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 14:28:59 +00:00
robertphillips@google.com
78ff6b4ab6 Moved mac, unix, win and mesa directories under src/gpu/gl
http://codereview.appspot.com/5937052/



git-svn-id: http://skia.googlecode.com/svn/trunk@3530 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 19:37:51 +00:00
robertphillips@google.com
d91f370835 Moved Debug GL interface to src/gpu/gl/debug in preparation for splitting it up.
http://codereview.appspot.com/5938054/



git-svn-id: http://skia.googlecode.com/svn/trunk@3526 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:22:01 +00:00
bungeman@google.com
f85abda8c9 Remove mutual dependency of gr and skgr.
http://codereview.appspot.com/5879043/


git-svn-id: http://skia.googlecode.com/svn/trunk@3467 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 17:56:29 +00:00
robertphillips@google.com
0da3719050 Added debug GL Interface. This interface tracks various GL objects in order to find leaks & invalid accesses.
Core Review: http://codereview.appspot.com/5846049/




git-svn-id: http://skia.googlecode.com/svn/trunk@3426 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-19 14:42:13 +00:00
bsalomon@google.com
f4a9c82918 Split GrTextContext into baseclass and subclass
This is a step towards enabling alternate text rendering code paths (GLyphy in particular)

Committed on behalf of baranowski@chromium.org

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3412 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 14:02:46 +00:00
epoger@google.com
aa3b6a965e Make all gyp targets automatically include common.gypi
Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too.
Review URL: https://codereview.appspot.com/5820068

git-svn-id: http://skia.googlecode.com/svn/trunk@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 13:52:49 +00:00
bsalomon@google.com
b4a4ab1e99 Remove offscreen supersampler.
THIS IS EXPECTED TO BREAK MANY GM TESTS. They will be rebaselined.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3305 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-02 18:57:25 +00:00
bsalomon@google.com
ca13d39f5e Revert 3191
Review URL: http://codereview.appspot.com/5656068/


git-svn-id: http://skia.googlecode.com/svn/trunk@3203 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-15 21:16:03 +00:00
bsalomon@google.com
621dfe6c84 Add test to detect bias in conversion of frag shader floats to bytes
Review URL: http://codereview.appspot.com/5669045/


git-svn-id: http://skia.googlecode.com/svn/trunk@3191 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 17:03:16 +00:00
tomhudson@google.com
6bf38b59c9 Move GL-specific include files to their own subdirectory, to better
coexist alongside D3D backend.
Requires gyp change.

http://codereview.appspot.com/5665045/



git-svn-id: http://skia.googlecode.com/svn/trunk@3185 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 15:11:59 +00:00
bsalomon@google.com
f7fa806d84 Make GLCaps be standalone and be a member of GrGLContextInfo
Review URL: http://codereview.appspot.com/5654084/



git-svn-id: http://skia.googlecode.com/svn/trunk@3183 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 14:09:57 +00:00
tomhudson@google.com
4072556641 Add two files missed in r3165; most critically the gyp!
git-svn-id: http://skia.googlecode.com/svn/trunk@3166 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-10 21:35:06 +00:00
bsalomon@google.com
89ec61e33d Add GrGLContextInfo
Review URL: http://codereview.appspot.com/5653060/



git-svn-id: http://skia.googlecode.com/svn/trunk@3162 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-10 20:05:18 +00:00
bsalomon@google.com
69cc6ad20e Add convex path renderer (disabled)
Review URL: http://codereview.appspot.com/5533061/



git-svn-id: http://skia.googlecode.com/svn/trunk@3040 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 14:25:10 +00:00
bsalomon@google.com
9f169a4b01 Add gyp variable to disable OSAA
Review URL: http://codereview.appspot.com/5539047



git-svn-id: http://skia.googlecode.com/svn/trunk@3033 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-12 20:56:52 +00:00
bsalomon@google.com
150d28465d Add code path to SW rasterize paths and upload as a mask texture
Review URL: http://codereview.appspot.com/5542043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3031 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-12 20:19:56 +00:00
tomhudson@google.com
086e5354fe Make GrGLShaderVar objects aware of whether they are uniform, varying, or
attribute varibles. Extract GLSL generation enum and utility function into
new GrGLSL header.



git-svn-id: http://skia.googlecode.com/svn/trunk@2827 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-08 14:44:10 +00:00
djsollen@google.com
44360bcca3 Changes to the android gyp system to build without RTTI and exceptions.
Review URL: http://codereview.appspot.com/5437089

git-svn-id: http://skia.googlecode.com/svn/trunk@2794 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-05 13:55:55 +00:00
bsalomon@google.com
1dcf506a1a Remove GrGpuGLFixed subclass and ES1 support
Review URL: http://codereview.appspot.com/5376094/


git-svn-id: http://skia.googlecode.com/svn/trunk@2678 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-14 19:29:53 +00:00
bsalomon@google.com
85b505bedc Add support for GL_ARB_texture_swizzle
Review URL: http://codereview.appspot.com/5347042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2615 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-07 14:56:51 +00:00
djsollen@google.com
58629291bc Adding support to trunk for building Skia using the Android NDK.
This CL depends on a subsequent CL to add the appropriate NDK
toolchain and system sources to the skia repo.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@2592 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-03 13:08:29 +00:00
bsalomon@google.com
74913722bf Add NULL GL context implementation. Use in bench (-nullgl) and SampleApp (backspace key)
Review URL: http://codereview.appspot.com/5303080/


git-svn-id: http://skia.googlecode.com/svn/trunk@2545 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-27 20:44:19 +00:00
tomhudson@google.com
9381363050 Extract GrDrawTarget::DrState into independent GrDrawState struct.
This is intended to be a first step towards making the stack of states
maintained by GrDrawTarget cheaper to maintain.



git-svn-id: http://skia.googlecode.com/svn/trunk@2544 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-27 20:21:16 +00:00
bsalomon@google.com
ffa11bbbed Move a bunch of headers from include/gpu to src/gpu. Delete some unused files.
Review URL: http://codereview.appspot.com/5304047/



git-svn-id: http://skia.googlecode.com/svn/trunk@2506 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-20 13:43:13 +00:00
bsalomon@google.com
373a6635b7 Virtualize SkGLContext with subclasses SkNativeGLContext and SkMesaGLContext, allow both in gm
Review URL: http://codereview.appspot.com/5307045/



git-svn-id: http://skia.googlecode.com/svn/trunk@2499 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-19 20:43:20 +00:00
bsalomon@google.com
e295313f01 move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files
Review URL: http://codereview.appspot.com/5242056/



git-svn-id: http://skia.googlecode.com/svn/trunk@2474 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-13 13:33:08 +00:00
bsalomon@google.com
d38f137e9b Move gpu/include/* to include/gpu and gpu/src/* to src/gpu
Review URL: http://codereview.appspot.com/5250070/



git-svn-id: http://skia.googlecode.com/svn/trunk@2471 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-12 19:53:16 +00:00
bsalomon@google.com
a30bc82a2e Remove nonexistant header from gyp file
Review URL: http://codereview.appspot.com/5179046/


git-svn-id: http://skia.googlecode.com/svn/trunk@2408 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-04 21:03:41 +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
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
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