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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/output/shader.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/shader.h
diff --git a/cc/output/shader.h b/cc/output/shader.h
index 5adca47de80d507af6c0acec6f60c45d5331f5ff..3c8102e53fd37ecabdfb9b8fcdd2514f62f2f457 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -83,6 +83,8 @@ class VertexShaderPosTex {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
@@ -100,6 +102,8 @@ class VertexShaderPosTexYUVStretchOffset {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int tex_scale_location() const { return tex_scale_location_; }
@@ -121,6 +125,8 @@ class VertexShaderPos {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
@@ -136,6 +142,8 @@ class VertexShaderPosTexIdentity {
unsigned program,
int* base_uniform_index) {}
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class VertexShaderPosTexTransform {
@@ -146,6 +154,8 @@ class VertexShaderPosTexTransform {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int tex_transform_location() const { return tex_transform_location_; }
@@ -167,6 +177,8 @@ class VertexShaderQuad {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int viewport_location() const { return -1; }
@@ -188,6 +200,8 @@ class VertexShaderQuadAA {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int viewport_location() const { return viewport_location_; }
@@ -212,6 +226,8 @@ class VertexShaderQuadTexTransformAA {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int viewport_location() const { return viewport_location_; }
@@ -237,6 +253,8 @@ class VertexShaderTile {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int viewport_location() const { return -1; }
@@ -262,6 +280,8 @@ class VertexShaderTileAA {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int viewport_location() const { return viewport_location_; }
@@ -289,6 +309,8 @@ class VertexShaderVideoTransform {
unsigned program,
int* base_uniform_index);
std::string GetShaderString() const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int matrix_location() const { return matrix_location_; }
int tex_matrix_location() const { return tex_matrix_location_; }
@@ -402,12 +424,16 @@ class FragmentShaderRGBATexVaryingAlpha : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATexPremultiplyAlpha : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderTexBackgroundVaryingAlpha
@@ -415,6 +441,8 @@ class FragmentShaderTexBackgroundVaryingAlpha
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderTexBackgroundPremultiplyAlpha
@@ -422,31 +450,41 @@ class FragmentShaderTexBackgroundPremultiplyAlpha
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATexAlpha : public FragmentTexAlphaBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATexColorMatrixAlpha
: public FragmentTexColorMatrixAlphaBinding {
public:
- std::string GetShaderString(
- TexCoordPrecision precision, SamplerType sampler) const;
+ std::string GetShaderString(TexCoordPrecision precision,
+ SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATexOpaque : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATex : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
// Swizzles the red and blue component of sampled texel with alpha.
@@ -454,6 +492,8 @@ class FragmentShaderRGBATexSwizzleAlpha : public FragmentTexAlphaBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
// Swizzles the red and blue component of sampled texel without alpha.
@@ -461,6 +501,8 @@ class FragmentShaderRGBATexSwizzleOpaque : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATexAlphaAA : public FragmentTexBlendMode {
@@ -472,6 +514,8 @@ class FragmentShaderRGBATexAlphaAA : public FragmentTexBlendMode {
int* base_uniform_index);
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
int alpha_location() const { return alpha_location_; }
int sampler_location() const { return sampler_location_; }
@@ -509,6 +553,8 @@ class FragmentShaderRGBATexClampAlphaAA
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
// Swizzles the red and blue component of sampled texel.
@@ -517,6 +563,8 @@ class FragmentShaderRGBATexClampSwizzleAlphaAA
public:
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
};
class FragmentShaderRGBATexAlphaMask : public FragmentTexBlendMode {
@@ -524,6 +572,8 @@ class FragmentShaderRGBATexAlphaMask : public FragmentTexBlendMode {
FragmentShaderRGBATexAlphaMask();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -553,6 +603,8 @@ class FragmentShaderRGBATexAlphaMaskAA : public FragmentTexBlendMode {
FragmentShaderRGBATexAlphaMaskAA();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -583,6 +635,8 @@ class FragmentShaderRGBATexAlphaMaskColorMatrixAA
FragmentShaderRGBATexAlphaMaskColorMatrixAA();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -614,6 +668,8 @@ class FragmentShaderRGBATexAlphaColorMatrixAA : public FragmentTexBlendMode {
FragmentShaderRGBATexAlphaColorMatrixAA();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -635,6 +691,8 @@ class FragmentShaderRGBATexAlphaMaskColorMatrix : public FragmentTexBlendMode {
FragmentShaderRGBATexAlphaMaskColorMatrix();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -666,6 +724,8 @@ class FragmentShaderYUVVideo : public FragmentTexBlendMode {
FragmentShaderYUVVideo();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -695,6 +755,8 @@ class FragmentShaderYUVAVideo : public FragmentTexBlendMode {
FragmentShaderYUVAVideo();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -727,6 +789,8 @@ class FragmentShaderColor : public FragmentTexBlendMode {
FragmentShaderColor();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -744,6 +808,8 @@ class FragmentShaderColorAA : public FragmentTexBlendMode {
FragmentShaderColorAA();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
@@ -761,6 +827,8 @@ class FragmentShaderCheckerboard : public FragmentTexBlendMode {
FragmentShaderCheckerboard();
std::string GetShaderString(
TexCoordPrecision precision, SamplerType sampler) const;
+ static std::string GetShaderHead();
+ static std::string GetShaderBody();
void Init(gpu::gles2::GLES2Interface* context,
unsigned program,
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698