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

Unified Diff: src/gpu/gl/GrGLShaderBuilder.h

Issue 22850006: Replace uses of GrAssert by SkASSERT. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase Created 7 years, 4 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 | « src/gpu/gl/GrGLSL_impl.h ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLShaderBuilder.h
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index e56f459ee4d9f3e0acbeec59817aeec0eefc09a8..a4fd82689d51ebb15273993985e1db858269d031 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -42,8 +42,8 @@ public:
TextureSampler(const TextureSampler& other) { *this = other; }
TextureSampler& operator= (const TextureSampler& other) {
- GrAssert(0 == fConfigComponentMask);
- GrAssert(!fSamplerUniform.isValid());
+ SkASSERT(0 == fConfigComponentMask);
+ SkASSERT(!fSamplerUniform.isValid());
fConfigComponentMask = other.fConfigComponentMask;
fSamplerUniform = other.fSamplerUniform;
@@ -64,24 +64,24 @@ public:
uint32_t configComponentMask,
const char* swizzle,
int idx) {
- GrAssert(!this->isInitialized());
- GrAssert(0 != configComponentMask);
- GrAssert(!fSamplerUniform.isValid());
+ SkASSERT(!this->isInitialized());
+ SkASSERT(0 != configComponentMask);
+ SkASSERT(!fSamplerUniform.isValid());
- GrAssert(NULL != builder);
+ SkASSERT(NULL != builder);
SkString name;
name.printf("Sampler%d", idx);
fSamplerUniform = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
kSampler2D_GrSLType,
name.c_str());
- GrAssert(fSamplerUniform.isValid());
+ SkASSERT(fSamplerUniform.isValid());
fConfigComponentMask = configComponentMask;
memcpy(fSwizzle, swizzle, 4);
}
void init(GrGLShaderBuilder* builder, const GrTextureAccess* access, int idx) {
- GrAssert(NULL != access);
+ SkASSERT(NULL != access);
this->init(builder,
GrPixelConfigComponentMask(access->getTexture()->config()),
access->getSwizzle(),
@@ -375,7 +375,7 @@ private:
class AutoStageRestore : GrNoncopyable {
public:
AutoStageRestore(CodeStage* codeStage, const GrEffectStage* newStage) {
- GrAssert(NULL != codeStage);
+ SkASSERT(NULL != codeStage);
fSavedIndex = codeStage->fCurrentIndex;
fSavedEffectStage = codeStage->fEffectStage;
@@ -398,7 +398,7 @@ private:
const GrEffectStage* fSavedEffectStage;
};
private:
- void validate() const { GrAssert((NULL == fEffectStage) == (-1 == fCurrentIndex)); }
+ void validate() const { SkASSERT((NULL == fEffectStage) == (-1 == fCurrentIndex)); }
int fNextIndex;
int fCurrentIndex;
const GrEffectStage* fEffectStage;
« no previous file with comments | « src/gpu/gl/GrGLSL_impl.h ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698