Remove _UPM_ GrPixelConfigs
Review URL: http://codereview.appspot.com/6460113/
git-svn-id: http://skia.googlecode.com/svn/trunk@5196 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
index c959f66..c1eb36e 100644
--- a/src/gpu/gl/GrGpuGL_program.cpp
+++ b/src/gpu/gl/GrGpuGL_program.cpp
@@ -733,7 +733,7 @@
stage.fInConfigFlags |= StageDesc::kSwapRAndB_InConfigFlag;
}
}
- if (GrPixelConfigIsUnpremultiplied(texture->config())) {
+ if (sampler.premultiply()) {
// Assert that if we're doing a premul conversion that the texture is 1 byte
// per color component. The rounding performed by the shader generator (in
// normalized float color space) assumes this.
@@ -758,7 +758,7 @@
}
}
- if (GrPixelConfigIsUnpremultiplied(drawState.getRenderTarget()->config())) {
+ if (drawState.isStateFlagEnabled(GrDrawState::kUnpremultiply_StageBit)) {
// The shader generator assumes that color channels are bytes
// when rounding.
GrAssert(4 == GrBytesPerPixel(drawState.getRenderTarget()->config()));