@galacean/engine-core 2.0.0-alpha.55 → 2.0.0-alpha.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/main.js CHANGED
@@ -7166,10 +7166,8 @@ ShaderBlockProperty._nameMap = Object.create(null);
7166
7166
  mrtIndexSet.forEach(function(index) {
7167
7167
  declaration += "layout(location=" + index + ") out vec4 fragOutColor" + index + ";\n";
7168
7168
  });
7169
- declaration += "void main(";
7170
7169
  shader = shader.replace(/\bgl_FragData\[(.+?)\]/g, "fragOutColor$1");
7171
- shader = shader.replace(/void\s+?main\s*\(/g, declaration);
7172
- return shader;
7170
+ return declaration + shader;
7173
7171
  };
7174
7172
  return ShaderFactory;
7175
7173
  }();
@@ -9019,7 +9017,7 @@ var precisionStr = "\n #ifdef GL_FRAGMENT_PRECISION_HIGH\n precision hig
9019
9017
  * Shader pass containing vertex and fragment source.
9020
9018
  */ var ShaderPass = /*#__PURE__*/ function(ShaderPart) {
9021
9019
  _inherits(ShaderPass, ShaderPart);
9022
- function ShaderPass(name, vertexShaderInstructions, fragmentShaderInstructions, platformTarget, tags) {
9020
+ function ShaderPass(name, vertexShaderInstructions, fragmentShaderInstructions, platformTarget, tags, vertexOutputNames) {
9023
9021
  var _this;
9024
9022
  _this = ShaderPart.call(this) || this, /** @internal */ _this._shaderPassId = 0, /** @internal Pass-level render state — always present, populated from ShaderLab declarations. */ _this._renderState = new RenderState(), /** @internal */ _this._renderStateDataMap = {}, /** @internal */ _this._shaderProgramMaps = [];
9025
9023
  _this._shaderPassId = ShaderPass._shaderPassCounter++;
@@ -9027,6 +9025,7 @@ var precisionStr = "\n #ifdef GL_FRAGMENT_PRECISION_HIGH\n precision hig
9027
9025
  _this._vertexShaderInstructions = vertexShaderInstructions;
9028
9026
  _this._fragmentShaderInstructions = fragmentShaderInstructions;
9029
9027
  _this._platformTarget = platformTarget;
9028
+ _this._vertexOutputNames = vertexOutputNames;
9030
9029
  var mergedTags = _extends({
9031
9030
  pipelineStage: PipelineStage.Forward
9032
9031
  }, tags);
@@ -9062,6 +9061,12 @@ var precisionStr = "\n #ifdef GL_FRAGMENT_PRECISION_HIGH\n precision hig
9062
9061
  /**
9063
9062
  * @internal
9064
9063
  */ _proto._compileShaderProgram = function _compileShaderProgram(engine, macroCollection, feedbackVaryings) {
9064
+ var names = this._vertexOutputNames;
9065
+ if (names && (feedbackVaryings == null ? void 0 : feedbackVaryings.length)) {
9066
+ feedbackVaryings = feedbackVaryings.map(function(name) {
9067
+ return Object.prototype.hasOwnProperty.call(names, name) ? names[name] : name;
9068
+ });
9069
+ }
9065
9070
  var isGPUInstance = macroCollection.isEnable(InstanceBuffer.gpuInstanceMacro);
9066
9071
  var _this__compileShaderSource = this._compileShaderSource(engine, macroCollection, isGPUInstance), vertexSource = _this__compileShaderSource.vertexSource, fragmentSource = _this__compileShaderSource.fragmentSource, instanceLayout = _this__compileShaderSource.instanceLayout;
9067
9072
  var program = new ShaderProgram(engine, vertexSource, fragmentSource, feedbackVaryings);
@@ -9262,7 +9267,7 @@ ShaderPass._macroMap = new Map();
9262
9267
  if (!shaderPassSource) {
9263
9268
  throw 'Shader pass "' + parsedSource.name + "." + subShaderSource.name + "." + passSource.name + '" parse failed, please check the shader source code.';
9264
9269
  }
9265
- var shaderPass = new ShaderPass(passSource.name, shaderPassSource.vertexShaderInstructions, shaderPassSource.fragmentShaderInstructions, platformTarget, passSource.tags);
9270
+ var shaderPass = new ShaderPass(passSource.name, shaderPassSource.vertexShaderInstructions, shaderPassSource.fragmentShaderInstructions, platformTarget, passSource.tags, shaderPassSource.vertexOutputNames);
9266
9271
  Shader._applyRenderStates(shaderPass, passSource.renderStates.constantMap, passSource.renderStates.variableMap, false);
9267
9272
  return shaderPass;
9268
9273
  });
@@ -9289,7 +9294,7 @@ ShaderPass._macroMap = new Map();
9289
9294
  if (passData.isUsePass) {
9290
9295
  return Shader._resolveUsePass(passData.name);
9291
9296
  }
9292
- var shaderPass = new ShaderPass(passData.name, passData.vertexShaderInstructions, passData.fragmentShaderInstructions, data.platformTarget, passData.tags);
9297
+ var shaderPass = new ShaderPass(passData.name, passData.vertexShaderInstructions, passData.fragmentShaderInstructions, data.platformTarget, passData.tags, passData.vertexOutputNames);
9293
9298
  Shader._applyRenderStates(shaderPass, passData.renderStates.constantMap, passData.renderStates.variableMap, true);
9294
9299
  return shaderPass;
9295
9300
  });