Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Side by Side Diff: Source/WebCore/platform/graphics/chromium/ShaderChromium.h

Issue 7477025: Merge 91720 - [Chromium] Use correct vertex shader when rendering video layer. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 class VertexShaderPosTexTransform { 84 class VertexShaderPosTexTransform {
85 public: 85 public:
86 VertexShaderPosTexTransform(); 86 VertexShaderPosTexTransform();
87 87
88 void init(GraphicsContext3D*, unsigned program); 88 void init(GraphicsContext3D*, unsigned program);
89 String getShaderString() const; 89 String getShaderString() const;
90 90
91 int matrixLocation() const { return m_matrixLocation; } 91 int matrixLocation() const { return m_matrixLocation; }
92 int texTransformLocation() const { return m_texTransformLocation; } 92 int texTransformLocation() const { return m_texTransformLocation; }
93
94 private:
95 int m_matrixLocation;
96 int m_texTransformLocation;
97 };
98
99 class VertexShaderQuad {
100 public:
101 VertexShaderQuad();
102
103 void init(GraphicsContext3D*, unsigned program);
104 String getShaderString() const;
105
106 int matrixLocation() const { return m_matrixLocation; }
107 int texTransformLocation() const { return m_texTransformLocation; }
93 int pointLocation() const { return m_pointLocation; } 108 int pointLocation() const { return m_pointLocation; }
94 109
95 private: 110 private:
96 int m_matrixLocation; 111 int m_matrixLocation;
97 int m_texTransformLocation; 112 int m_texTransformLocation;
98 int m_pointLocation; 113 int m_pointLocation;
99 }; 114 };
100 115
101 class FragmentTexAlphaBinding { 116 class FragmentTexAlphaBinding {
102 public: 117 public:
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 191
177 private: 192 private:
178 int m_colorLocation; 193 int m_colorLocation;
179 }; 194 };
180 195
181 } // namespace WebCore 196 } // namespace WebCore
182 197
183 #endif // USE(ACCELERATED_COMPOSITING) 198 #endif // USE(ACCELERATED_COMPOSITING)
184 199
185 #endif 200 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698