From e8c701cbf5f8749415d4411173234aebb1add740 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 8 Mar 2011 18:19:05 +0000 Subject: [PATCH] Add filters to organize the VS project. Remove unused Gr files. Review URL http://codereview.appspot.com/4243064/ git-svn-id: http://skia.googlecode.com/svn/trunk@904 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu/include/GrAPI.h | 37 -- gpu/src/GrQuadIndexTable.h | 98 ---- vs/SampleApp/SampleApp.vcxproj | 3 +- vs/SampleApp/SampleApp.vcxproj.filters | 751 +++++++++++++++++++++++++ 4 files changed, 752 insertions(+), 137 deletions(-) delete mode 100644 gpu/include/GrAPI.h delete mode 100644 gpu/src/GrQuadIndexTable.h create mode 100644 vs/SampleApp/SampleApp.vcxproj.filters diff --git a/gpu/include/GrAPI.h b/gpu/include/GrAPI.h deleted file mode 100644 index b660e8d86..000000000 --- a/gpu/include/GrAPI.h +++ /dev/null @@ -1,37 +0,0 @@ - - -class GrAPI { -public: - - void setRenderTarget(GrRenderTarget* target); - - void setMatrix(const GrMatrix&); - - void setClip(rect, bool aa); - void setClip(rect[], bool aa); - void setClip(path, bool aa); - void setClip(rect, texture/key, state, matrix); - void setClip(path, texture/key, state, matrix); - - void setColor(color); - void setTexture(texture/key, sampler, const GrMatrix* = NULL); - void setBlend(src, dst); - - void drawRect(const GrRect&, stroke, join); - void drawOval(const GrRect&, stroke); - void drawRoundRect(const GrRect&, GrScalar ovalW, GrScalar ovalH, stroke); - void drawPath(const GrPathIter&, GrPathFill); - void drawVertices(...); - void drawGlyphs(const uint16_t[], int count, const GrPoint[], GrFontScaler*); - -/// - - void save(); - void restore(); - void concatMatrix(const GrMatrix&); - void concatClipRect(const GrRect&); - void concatClipPath(const GrPathIter&, bool aa); - -}; - - diff --git a/gpu/src/GrQuadIndexTable.h b/gpu/src/GrQuadIndexTable.h deleted file mode 100644 index 7389466b8..000000000 --- a/gpu/src/GrQuadIndexTable.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - Copyright 2010 Google Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - -/* - These are our vertex-indices for a series of "quads", which we implement - as a series of pairs of triangles. See setRectFan() for the - vertex order. - - The largest value is 255, so we could store these in any size - (byte, short, int). Since the table is small, we just choose the size - that we think will be fastest (e.g. some drivers don't have native support - for byte-indices, so byte may not be the fastest) -*/ -static const uint16_t gQuadIndexTable[] = { - 0, 1, 2, 0, 2, 3, - 4, 5, 6, 4, 6, 7, - 8, 9, 10, 8, 10, 11, - 12, 13, 14, 12, 14, 15, - 16, 17, 18, 16, 18, 19, - 20, 21, 22, 20, 22, 23, - 24, 25, 26, 24, 26, 27, - 28, 29, 30, 28, 30, 31, - 32, 33, 34, 32, 34, 35, - 36, 37, 38, 36, 38, 39, - 40, 41, 42, 40, 42, 43, - 44, 45, 46, 44, 46, 47, - 48, 49, 50, 48, 50, 51, - 52, 53, 54, 52, 54, 55, - 56, 57, 58, 56, 58, 59, - 60, 61, 62, 60, 62, 63, - 64, 65, 66, 64, 66, 67, - 68, 69, 70, 68, 70, 71, - 72, 73, 74, 72, 74, 75, - 76, 77, 78, 76, 78, 79, - 80, 81, 82, 80, 82, 83, - 84, 85, 86, 84, 86, 87, - 88, 89, 90, 88, 90, 91, - 92, 93, 94, 92, 94, 95, - 96, 97, 98, 96, 98, 99, - 100, 101, 102, 100, 102, 103, - 104, 105, 106, 104, 106, 107, - 108, 109, 110, 108, 110, 111, - 112, 113, 114, 112, 114, 115, - 116, 117, 118, 116, 118, 119, - 120, 121, 122, 120, 122, 123, - 124, 125, 126, 124, 126, 127, - 128, 129, 130, 128, 130, 131, - 132, 133, 134, 132, 134, 135, - 136, 137, 138, 136, 138, 139, - 140, 141, 142, 140, 142, 143, - 144, 145, 146, 144, 146, 147, - 148, 149, 150, 148, 150, 151, - 152, 153, 154, 152, 154, 155, - 156, 157, 158, 156, 158, 159, - 160, 161, 162, 160, 162, 163, - 164, 165, 166, 164, 166, 167, - 168, 169, 170, 168, 170, 171, - 172, 173, 174, 172, 174, 175, - 176, 177, 178, 176, 178, 179, - 180, 181, 182, 180, 182, 183, - 184, 185, 186, 184, 186, 187, - 188, 189, 190, 188, 190, 191, - 192, 193, 194, 192, 194, 195, - 196, 197, 198, 196, 198, 199, - 200, 201, 202, 200, 202, 203, - 204, 205, 206, 204, 206, 207, - 208, 209, 210, 208, 210, 211, - 212, 213, 214, 212, 214, 215, - 216, 217, 218, 216, 218, 219, - 220, 221, 222, 220, 222, 223, - 224, 225, 226, 224, 226, 227, - 228, 229, 230, 228, 230, 231, - 232, 233, 234, 232, 234, 235, - 236, 237, 238, 236, 238, 239, - 240, 241, 242, 240, 242, 243, - 244, 245, 246, 244, 246, 247, - 248, 249, 250, 248, 250, 251, - 252, 253, 254, 252, 254, 255, -}; - -#define GR_COUNT_QUADINDEXTABLE GR_ARRAY_COUNT(gQuadIndexTable) - - - diff --git a/vs/SampleApp/SampleApp.vcxproj b/vs/SampleApp/SampleApp.vcxproj index a3dc518ff..722164f92 100644 --- a/vs/SampleApp/SampleApp.vcxproj +++ b/vs/SampleApp/SampleApp.vcxproj @@ -93,7 +93,6 @@ - @@ -155,7 +154,7 @@ - + diff --git a/vs/SampleApp/SampleApp.vcxproj.filters b/vs/SampleApp/SampleApp.vcxproj.filters new file mode 100644 index 000000000..4ba6d250a --- /dev/null +++ b/vs/SampleApp/SampleApp.vcxproj.filters @@ -0,0 +1,751 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + Gr\src + + + SkGr + + + SkGr + + + SkGr + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + Samples + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + PDF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\include + + + Gr\src_headers + + + Gr\src_headers + + + Gr\src_headers + + + Gr\src_headers + + + Gr\src_headers + + + Gr\src_headers + + + Gr\src_headers + + + Gr\include + + + SkGr + + + SkGr + + + SkGr + + + Samples + + + Samples + + + + + + + Samples + + + + + {be4efeb0-9660-4f27-a908-7d5aa8330b9a} + + + {a4e4292c-a9c2-453e-b826-963612dc47c7} + + + {ecd7a498-8705-49c9-8e54-735f7fe285dd} + + + {a4a29df5-a26a-439b-96a5-da8701c371dc} + + + {1d1e3222-86db-4833-b6cc-f34d1d7feafe} + + + {2c3cdfc4-c2df-4c50-8703-5081e4532949} + + + {1ba39f1a-824c-4304-bfc9-586c47e971c5} + + + + + Samples + + + \ No newline at end of file