ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace goog.getUid with ol.getUid

Browse Source
This commit is contained in:
Peter Robins
2016-07-20 10:50:16 +00:00
parent 29230d48b3
commit f8f2cd11d5
40 changed files with 104 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/webgl/context.js
+4 -4
View File
@@ -108,7 +108,7 @@ ol.inherits(ol.webgl.Context, ol.Disposable);
ol.webgl.Context.prototype.bindBuffer = function(target, buf) {
var gl = this.getGL();
var arr = buf.getArray();
var bufferKey = String(goog.getUid(buf));
var bufferKey = String(ol.getUid(buf));
if (bufferKey in this.bufferCache_) {
var bufferCacheEntry = this.bufferCache_[bufferKey];
gl.bindBuffer(target, bufferCacheEntry.buffer);
@@ -141,7 +141,7 @@ ol.webgl.Context.prototype.bindBuffer = function(target, buf) {
*/
ol.webgl.Context.prototype.deleteBuffer = function(buf) {
var gl = this.getGL();
var bufferKey = String(goog.getUid(buf));
var bufferKey = String(ol.getUid(buf));
goog.asserts.assert(bufferKey in this.bufferCache_,
'attempted to delete uncached buffer');
var bufferCacheEntry = this.bufferCache_[bufferKey];
@@ -214,7 +214,7 @@ ol.webgl.Context.prototype.getHitDetectionFramebuffer = function() {
* @return {WebGLShader} Shader.
*/
ol.webgl.Context.prototype.getShader = function(shaderObject) {
var shaderKey = String(goog.getUid(shaderObject));
var shaderKey = String(ol.getUid(shaderObject));
if (shaderKey in this.shaderCache_) {
return this.shaderCache_[shaderKey];
} else {
@@ -243,7 +243,7 @@ ol.webgl.Context.prototype.getShader = function(shaderObject) {
ol.webgl.Context.prototype.getProgram = function(
fragmentShaderObject, vertexShaderObject) {
var programKey =
goog.getUid(fragmentShaderObject) + '/' + goog.getUid(vertexShaderObject);
ol.getUid(fragmentShaderObject) + '/' + ol.getUid(vertexShaderObject);
if (programKey in this.programCache_) {
return this.programCache_[programKey];
} else {