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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/cross/gl/param_cache_gl.cc

Issue 159168: This fixes a number of things that are warnings in the Mac compiler.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 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 side-by-side diff with in-line comments
Download patch
« core/cross/bitmap_dds.cc ('K') | « core/cross/gl/buffer_gl.cc ('k') | core/cross/gl/primitive_gl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/cross/gl/param_cache_gl.cc
===================================================================
--- core/cross/gl/param_cache_gl.cc (revision 21208)
+++ core/cross/gl/param_cache_gl.cc (working copy)
@@ -326,7 +326,6 @@
for (int i = 0; i < size; ++i) {
Param* untyped_element = param->GetUntypedParam(i);
if (untyped_element->IsA(ParamSampler::GetApparentClass())) {
- CGparameter cg_element = cgGetArrayParameter(cg_param, i);
ParamSampler* element = down_cast<ParamSampler*>(untyped_element);
SamplerGL* sampler_gl = down_cast<SamplerGL*>(element->value());
if (!sampler_gl) {
@@ -458,6 +457,8 @@
handler = EffectParamHandlerGL::Ref(
new EffectParamArraySamplerHandlerGL(param_param_array));
break;
+ default:
+ break;
}
} else if (param->IsA(ParamMatrix4::GetApparentClass())) {
if (cg_type == CG_FLOAT4x4) {
« core/cross/bitmap_dds.cc ('K') | « core/cross/gl/buffer_gl.cc ('k') | core/cross/gl/primitive_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698