AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc stage->effect renaming

Browse Source 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6787043

git-svn-id: http://skia.googlecode.com/svn/trunk@6132 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2012-10-25 21:52:43 +00:00
parent 0707c29413
commit c196b522d0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/GrDrawState.h
View File

@ -473,7 +473,7 @@ public:
/**
* Preconcats the current view matrix and restores the previous view matrix in the destructor.
* Stage matrices are automatically adjusted to compensate.
* Effect matrices are automatically adjusted to compensate.
*/
class AutoViewMatrixRestore : public ::GrNoncopyable {
public:

22
src/gpu/gl/GrGLProgram.cpp
View File

@ -904,7 +904,7 @@ GrGLEffect* GrGLProgram::GenStageCode(const GrEffect* effect,
const char* vsInCoord,
GrGLShaderBuilder* builder) {
GrGLEffect* glStage = effect->getFactory().createGLInstance(*effect);
GrGLEffect* glEffect = effect->getFactory().createGLInstance(*effect);
/// Vertex Shader Stuff
@ -953,19 +953,19 @@ GrGLEffect* GrGLProgram::GenStageCode(const GrEffect* effect,
}
// Enclose custom code in a block to avoid namespace conflicts
builder->fVSCode.appendf("\t{ // %s\n", glStage->name());
builder->fFSCode.appendf("\t{ // %s \n", glStage->name());
glStage->emitCode(builder,
*effect,
desc.fEffectKey,
varyingVSName,
fsOutColor,
fsInColor,
textureSamplers);
builder->fVSCode.appendf("\t{ // %s\n", glEffect->name());
builder->fFSCode.appendf("\t{ // %s \n", glEffect->name());
glEffect->emitCode(builder,
*effect,
desc.fEffectKey,
varyingVSName,
fsOutColor,
fsInColor,
textureSamplers);
builder->fVSCode.appendf("\t}\n");
builder->fFSCode.appendf("\t}\n");
return glStage;
return glEffect;
}
void GrGLProgram::setData(const GrDrawState& drawState) {