GlfBaseTexture: using glGenerateMipmap instead of setting obsoleted G…

…L_GENERATE_MIPMAP texture property.

Fixes #1171

(Internal change: 2067269)

pxr/imaging/glf/baseTexture.cpp

@@ -348,6 +348,8 @@ GlfBaseTexture::_CreateTexture(GlfBaseTextureDataConstPtr texData,
 
         glBindTexture(textureTarget, _textureName);
 
+        bool generateMipMaps = false;
+
         // Check if mip maps have been requested, if so, it will either
         // enable automatic generation or use the ones loaded in cpu memory
         int numMipLevels = 1;
@@ -365,10 +367,10 @@ GlfBaseTexture::_CreateTexture(GlfBaseTextureDataConstPtr texData,
             if (numMipLevels > 1) {
                 glTexParameteri(textureTarget, GL_TEXTURE_MAX_LEVEL, numMipLevels-1);
             } else {
-                glTexParameteri(textureTarget, GL_GENERATE_MIPMAP, GL_TRUE);
+                generateMipMaps = true;
             }
         } else {
-            glTexParameteri(textureTarget, GL_GENERATE_MIPMAP, GL_FALSE);
+            glTexParameteri(textureTarget, GL_TEXTURE_MAX_LEVEL, 0);
         }
 
         if (texData->IsCompressed()) {
@@ -492,6 +494,10 @@ GlfBaseTexture::_CreateTexture(GlfBaseTextureDataConstPtr texData,
             }
         }
 
+        if (generateMipMaps) {
+            glGenerateMipmap(textureTarget);
+        }
+
         glBindTexture(textureTarget, 0);
         _SetMemoryUsed(texData->ComputeBytesUsed());
     }