Guess at getting linux build to work.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25948 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 15 deletions

diff --git a/o3d/core/cross/gl/texture_gl.cc b/o3d/core/cross/gl/texture_gl.cc
index b65ff7f..9b4ea7fe4 100644
--- a/o3d/core/cross/gl/texture_gl.cc
+++ b/o3d/core/cross/gl/texture_gl.cc
@@ -307,10 +307,10 @@ Texture2DGL* Texture2DGL::Create(ServiceLocator* service_locator,
     glDeleteTextures(1, &gl_texture);
     return NULL;
   }
-  glTexParameteri(GL_TEXTURE_CUBE_MAP,
+  glTexParameteri(GL_TEXTURE_2D,
                   GL_TEXTURE_MIN_FILTER,
                   GL_NEAREST_MIPMAP_LINEAR);
-  glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
@@ -625,10 +625,10 @@ TextureCUBEGL* TextureCUBEGL::Create(ServiceLocator* service_locator,
                    format, levels, edge_length, edge_length,
                    resize_to_pot);
   }
-  glTexParameteri(GL_TEXTURE_2D,
+  glTexParameteri(GL_TEXTURE_CUBE_MAP,
                   GL_TEXTURE_MIN_FILTER,
                   GL_NEAREST_MIPMAP_LINEAR);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
diff --git a/o3d/core/cross/render_surface_test.cc b/o3d/core/cross/render_surface_test.cc
index b1bfd3c..34e1e6d 100644
--- a/o3d/core/cross/render_surface_test.cc
+++ b/o3d/core/cross/render_surface_test.cc
@@ -36,11 +36,11 @@
 #include "core/cross/pack.h"

 #include "core/cross/renderer.h"

 #include "core/cross/bitmap.h"

-#include "core/cross/features.h"

 #include "core/cross/texture.h"

 #include "core/cross/render_surface.h"

 #include "core/cross/render_surface_set.h"

 #include "core/cross/renderer_platform.h"

+#include "core/cross/error_status.h"

 

 // Defined in testing_common.cc, for each platform.

 extern o3d::DisplayWindow* g_display_window;

@@ -50,10 +50,8 @@ namespace o3d {
 class RenderSurfaceTest : public testing::Test {

  public:

   RenderSurfaceTest()

-      : object_manager_(g_service_locator) {}

-

-  ServiceLocator* service_locator() {

-    return service_locator_;

+      : object_manager_(g_service_locator),

+        error_status_(g_service_locator) {

   }

 

   Renderer* renderer() {

@@ -62,8 +60,6 @@ class RenderSurfaceTest : public testing::Test {
 

  protected:

   virtual void SetUp() {

-    service_locator_ = new ServiceLocator;

-    features_ = new Features(service_locator_);

     pack_ = object_manager_->CreatePack();

     g_renderer->StartRendering();

   }

@@ -71,15 +67,13 @@ class RenderSurfaceTest : public testing::Test {
   virtual void TearDown() {

     g_renderer->FinishRendering();

     pack_->Destroy();

-    delete features_;

-    delete service_locator_;

+    error_status_.ClearLastError();

   }

 

   Pack* pack() { return pack_; }

 

   ServiceDependency<ObjectManager> object_manager_;

-  ServiceLocator* service_locator_;

-  Features* features_;

+  ErrorStatus error_status_;

   Pack* pack_;

 };