Code

V4 custom shader batching support#20584

Code

Open

rh101 wants to merge 10 commits intococos2d:v4cocos2d/cocos2d-x:v4from rh101:v4-custom-shader-batchingrh101/cocos2d-x:v4-custom-shader-batchingCopy head branch name to clipboard

+69-71

Commits

Commits on Sep 23, 2019

• Merge pull request #12 from cocos2d/v4

  Show description for c98560e
  rh101

  authored
  c98560e

  Copy full SHA for c98560e

Commits on Sep 27, 2019

• Merge pull request #14 from cocos2d/v4

  Show description for 3b19ecc
  rh101

  authored
  3b19ecc

  Copy full SHA for 3b19ecc

Commits on Dec 10, 2019

• Merge pull request #18 from cocos2d/v4

  Show description for 310d717
  rh101

  authored
  310d717

  Copy full SHA for 310d717

Commits on Dec 29, 2019

• Merge pull request #20 from cocos2d/v4

  Show description for 3085453
  rh101

  authored
  3085453

  Copy full SHA for 3085453

Commits on May 14, 2020

• Merge pull request #21 from cocos2d/v4

  Show description for 8e46166
  rh101

  authored
  8e46166

  Copy full SHA for 8e46166

Commits on Sep 14, 2020

• Merge pull request #22 from cocos2d/v4

  Show description for d3dc5ad
  rh101

  authored
  d3dc5ad

  Copy full SHA for d3dc5ad

Commits on Sep 16, 2020

• Allow users to specify their own ProgramType ID in order to support sprite batching with custom shaders. This also requires that ProgramState also have its own unique ID, since ProgramState can hav…

  Show description for c5b50fc
  rh101

  committed
  c5b50fc

  Copy full SHA for c5b50fc

• Make setProgramType() public so user code can set custom value.

  rh101

  committed
  e985163

  Copy full SHA for e985163

Commits on Sep 17, 2020

• Rename the program state ID to something more meaningful and related to its purpose, which is now _programStateBatchId

  rh101

  committed
  d2a5fb0

  Copy full SHA for d2a5fb0

Commits on Sep 24, 2020

• No need to re-define std::hash for uint32_t type.

  rh101

  committed
  47aba70

  Copy full SHA for 47aba70