Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix crash on windows

This commit is contained in:
Huabing.Xu 2015-01-20 16:50:51 +08:00
parent 5459149279
commit 79eee9b145
8 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cocos/2d/CCDrawNode.cpp
View File

@ -185,7 +185,7 @@ void DrawNode::ensureCapacityGLPoint(int count)
if(_bufferCountGLPoint + count > _bufferCapacityGLPoint) if(_bufferCountGLPoint + count > _bufferCapacityGLPoint)
{ {
_bufferCapacityGLPoint += MAX(_bufferCapacityGLPoint, count); _bufferCapacityGLPoint += MAX(_bufferCapacityGLPoint, count);
_bufferGLPoint = (V2F_C4B_PF*)realloc(_bufferGLPoint, _bufferCapacityGLPoint*sizeof(V2F_C4B_PF)); _bufferGLPoint = (V2F_C4B_T2F*)realloc(_bufferGLPoint, _bufferCapacityGLPoint*sizeof(V2F_C4B_T2F));
} }
} }
@ -254,15 +254,13 @@ bool DrawNode::init()
glGenBuffers(1, &_vboGLPoint); glGenBuffers(1, &_vboGLPoint);
glBindBuffer(GL_ARRAY_BUFFER, _vboGLPoint); glBindBuffer(GL_ARRAY_BUFFER, _vboGLPoint);
glBufferData(GL_ARRAY_BUFFER, sizeof(V2F_C4B_T2F)*_bufferCapacityGLPoint, _bufferGLPoint, GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(V2F_C4B_T2F)*_bufferCapacityGLPoint, _bufferGLPoint, GL_STREAM_DRAW);
GL::enableVertexAttribs(GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX);
// vertex // vertex
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, vertices));
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_PF), (GLvoid *)offsetof(V2F_C4B_PF, vertices));
// color // color
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, colors));
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_PF), (GLvoid *)offsetof(V2F_C4B_PF, colors)); // Texture coord as pointsize
// pointsize glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords));
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POINTSIZE);
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POINTSIZE, 1, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_PF), (GLvoid *)offsetof(V2F_C4B_PF, pointSize));
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
if (Configuration::getInstance()->supportsShareableVAO()) if (Configuration::getInstance()->supportsShareableVAO())
@ -389,14 +387,14 @@ void DrawNode::onDrawGLLine(const Mat4 &transform, uint32_t flags)
void DrawNode::onDrawGLPoint(const Mat4 &transform, uint32_t flags) void DrawNode::onDrawGLPoint(const Mat4 &transform, uint32_t flags)
{ {
auto glProgram = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_COLOR_POINTSIZE); auto glProgram = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_COLOR_TEXASPOINTSIZE);
glProgram->use(); glProgram->use();
glProgram->setUniformsForBuiltins(transform); glProgram->setUniformsForBuiltins(transform);
if (_dirtyGLPoint) if (_dirtyGLPoint)
{ {
glBindBuffer(GL_ARRAY_BUFFER, _vboGLPoint); glBindBuffer(GL_ARRAY_BUFFER, _vboGLPoint);
glBufferData(GL_ARRAY_BUFFER, sizeof(V2F_C4B_PF)*_bufferCapacityGLPoint, _bufferGLPoint, GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(V2F_C4B_T2F)*_bufferCapacityGLPoint, _bufferGLPoint, GL_STREAM_DRAW);
_dirtyGLPoint = false; _dirtyGLPoint = false;
} }
@ -408,10 +406,10 @@ void DrawNode::onDrawGLPoint(const Mat4 &transform, uint32_t flags)
else else
{ {
glBindBuffer(GL_ARRAY_BUFFER, _vboGLPoint); glBindBuffer(GL_ARRAY_BUFFER, _vboGLPoint);
GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_COLOR); GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX);
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_PF), (GLvoid *)offsetof(V2F_C4B_PF, vertices)); glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, vertices));
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_PF), (GLvoid *)offsetof(V2F_C4B_PF, colors)); glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, colors));
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POINTSIZE, 1, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_PF), (GLvoid *)offsetof(V2F_C4B_PF, pointSize)); glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 1, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords));
} }
glDrawArrays(GL_POINTS, 0, _bufferCountGLPoint); glDrawArrays(GL_POINTS, 0, _bufferCountGLPoint);
@ -425,8 +423,8 @@ void DrawNode::drawPoint(const Vec2& position, const float pointSize, const Colo
{ {
ensureCapacityGLPoint(1); ensureCapacityGLPoint(1);
V2F_C4B_PF *point = (V2F_C4B_PF*)(_bufferGLPoint + _bufferCountGLPoint); V2F_C4B_T2F *point = (V2F_C4B_T2F*)(_bufferGLPoint + _bufferCountGLPoint);
V2F_C4B_PF a = {position, Color4B(color), pointSize}; V2F_C4B_T2F a = {position, Color4B(color), Tex2F(pointSize,0)};
*point = a; *point = a;
_bufferCountGLPoint += 1; _bufferCountGLPoint += 1;
@ -442,11 +440,11 @@ void DrawNode::drawPoints(const Vec2 *position, unsigned int numberOfPoints, con
{ {
ensureCapacityGLPoint(numberOfPoints); ensureCapacityGLPoint(numberOfPoints);
V2F_C4B_PF *point = (V2F_C4B_PF*)(_bufferGLPoint + _bufferCountGLPoint); V2F_C4B_T2F *point = (V2F_C4B_T2F*)(_bufferGLPoint + _bufferCountGLPoint);
for(unsigned int i=0; i < numberOfPoints; i++,point++) for(unsigned int i=0; i < numberOfPoints; i++,point++)
{ {
V2F_C4B_PF a = {position[i], Color4B(color), pointSize}; V2F_C4B_T2F a = {position[i], Color4B(color), Tex2F(pointSize,0)};
*point = a; *point = a;
} }

2
cocos/2d/CCDrawNode.h
View File

@ -154,7 +154,7 @@ protected:
int _bufferCapacityGLPoint; int _bufferCapacityGLPoint;
GLsizei _bufferCountGLPoint; GLsizei _bufferCountGLPoint;
V2F_C4B_PF *_bufferGLPoint; V2F_C4B_T2F *_bufferGLPoint;
Color4F _pointColor; Color4F _pointColor;
int _pointSize; int _pointSize;

4
cocos/renderer/CCGLProgram.cpp
View File

@ -50,7 +50,7 @@ const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP = "ShaderPositi
const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST = "ShaderPositionTextureColorAlphaTest"; const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST = "ShaderPositionTextureColorAlphaTest";
const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST_NO_MV = "ShaderPositionTextureColorAlphaTest_NoMV"; const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST_NO_MV = "ShaderPositionTextureColorAlphaTest_NoMV";
const char* GLProgram::SHADER_NAME_POSITION_COLOR = "ShaderPositionColor"; const char* GLProgram::SHADER_NAME_POSITION_COLOR = "ShaderPositionColor";
const char* GLProgram::SHADER_NAME_POSITION_COLOR_POINTSIZE = "ShaderPositionColorPointsize"; const char* GLProgram::SHADER_NAME_POSITION_COLOR_TEXASPOINTSIZE = "ShaderPositionColorTexAsPointsize";
const char* GLProgram::SHADER_NAME_POSITION_COLOR_NO_MVP = "ShaderPositionColor_noMVP"; const char* GLProgram::SHADER_NAME_POSITION_COLOR_NO_MVP = "ShaderPositionColor_noMVP";
const char* GLProgram::SHADER_NAME_POSITION_TEXTURE = "ShaderPositionTexture"; const char* GLProgram::SHADER_NAME_POSITION_TEXTURE = "ShaderPositionTexture";
const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_U_COLOR = "ShaderPositionTexture_uColor"; const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_U_COLOR = "ShaderPositionTexture_uColor";
@ -90,7 +90,6 @@ const char* GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE = "CC_alpha_value";
// Attribute names // Attribute names
const char* GLProgram::ATTRIBUTE_NAME_COLOR = "a_color"; const char* GLProgram::ATTRIBUTE_NAME_COLOR = "a_color";
const char* GLProgram::ATTRIBUTE_NAME_POSITION = "a_position"; const char* GLProgram::ATTRIBUTE_NAME_POSITION = "a_position";
const char* GLProgram::ATTRIBUTE_NAME_POINTSIZE = "a_pointSize";
const char* GLProgram::ATTRIBUTE_NAME_TEX_COORD = "a_texCoord"; const char* GLProgram::ATTRIBUTE_NAME_TEX_COORD = "a_texCoord";
const char* GLProgram::ATTRIBUTE_NAME_TEX_COORD1 = "a_texCoord1"; const char* GLProgram::ATTRIBUTE_NAME_TEX_COORD1 = "a_texCoord1";
const char* GLProgram::ATTRIBUTE_NAME_TEX_COORD2 = "a_texCoord2"; const char* GLProgram::ATTRIBUTE_NAME_TEX_COORD2 = "a_texCoord2";
@ -278,7 +277,6 @@ void GLProgram::bindPredefinedVertexAttribs()
} attribute_locations[] = } attribute_locations[] =
{ {
{GLProgram::ATTRIBUTE_NAME_POSITION, GLProgram::VERTEX_ATTRIB_POSITION}, {GLProgram::ATTRIBUTE_NAME_POSITION, GLProgram::VERTEX_ATTRIB_POSITION},
{GLProgram::ATTRIBUTE_NAME_POINTSIZE, GLProgram::VERTEX_ATTRIB_POINTSIZE},
{GLProgram::ATTRIBUTE_NAME_COLOR, GLProgram::VERTEX_ATTRIB_COLOR}, {GLProgram::ATTRIBUTE_NAME_COLOR, GLProgram::VERTEX_ATTRIB_COLOR},
{GLProgram::ATTRIBUTE_NAME_TEX_COORD, GLProgram::VERTEX_ATTRIB_TEX_COORD}, {GLProgram::ATTRIBUTE_NAME_TEX_COORD, GLProgram::VERTEX_ATTRIB_TEX_COORD},
{GLProgram::ATTRIBUTE_NAME_TEX_COORD1, GLProgram::VERTEX_ATTRIB_TEX_COORD1}, {GLProgram::ATTRIBUTE_NAME_TEX_COORD1, GLProgram::VERTEX_ATTRIB_TEX_COORD1},

4
cocos/renderer/CCGLProgram.h
View File

@ -89,7 +89,6 @@ public:
VERTEX_ATTRIB_NORMAL, VERTEX_ATTRIB_NORMAL,
VERTEX_ATTRIB_BLEND_WEIGHT, VERTEX_ATTRIB_BLEND_WEIGHT,
VERTEX_ATTRIB_BLEND_INDEX, VERTEX_ATTRIB_BLEND_INDEX,
VERTEX_ATTRIB_POINTSIZE,
VERTEX_ATTRIB_MAX, VERTEX_ATTRIB_MAX,
// backward compatibility // backward compatibility
@ -120,7 +119,7 @@ public:
static const char* SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST; static const char* SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST;
static const char* SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST_NO_MV; static const char* SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST_NO_MV;
static const char* SHADER_NAME_POSITION_COLOR; static const char* SHADER_NAME_POSITION_COLOR;
static const char* SHADER_NAME_POSITION_COLOR_POINTSIZE; static const char* SHADER_NAME_POSITION_COLOR_TEXASPOINTSIZE;
static const char* SHADER_NAME_POSITION_COLOR_NO_MVP; static const char* SHADER_NAME_POSITION_COLOR_NO_MVP;
static const char* SHADER_NAME_POSITION_TEXTURE; static const char* SHADER_NAME_POSITION_TEXTURE;
static const char* SHADER_NAME_POSITION_TEXTURE_U_COLOR; static const char* SHADER_NAME_POSITION_TEXTURE_U_COLOR;
@ -161,7 +160,6 @@ public:
// Attribute names // Attribute names
static const char* ATTRIBUTE_NAME_COLOR; static const char* ATTRIBUTE_NAME_COLOR;
static const char* ATTRIBUTE_NAME_POSITION; static const char* ATTRIBUTE_NAME_POSITION;
static const char* ATTRIBUTE_NAME_POINTSIZE;
static const char* ATTRIBUTE_NAME_TEX_COORD; static const char* ATTRIBUTE_NAME_TEX_COORD;
static const char* ATTRIBUTE_NAME_TEX_COORD1; static const char* ATTRIBUTE_NAME_TEX_COORD1;
static const char* ATTRIBUTE_NAME_TEX_COORD2; static const char* ATTRIBUTE_NAME_TEX_COORD2;

14
cocos/renderer/CCGLProgramCache.cpp
View File

@ -40,7 +40,7 @@ enum {
kShaderType_PositionTextureColorAlphaTest, kShaderType_PositionTextureColorAlphaTest,
kShaderType_PositionTextureColorAlphaTestNoMV, kShaderType_PositionTextureColorAlphaTestNoMV,
kShaderType_PositionColor, kShaderType_PositionColor,
kShaderType_PositionColorPointsize, kShaderType_PositionColorTextureAsPointsize,
kShaderType_PositionColor_noMVP, kShaderType_PositionColor_noMVP,
kShaderType_PositionTexture, kShaderType_PositionTexture,
kShaderType_PositionTexture_uColor, kShaderType_PositionTexture_uColor,
@ -142,8 +142,8 @@ void GLProgramCache::loadDefaultGLPrograms()
// Position, Color, PointSize shader // Position, Color, PointSize shader
p = new (std::nothrow) GLProgram(); p = new (std::nothrow) GLProgram();
loadDefaultGLProgram(p, kShaderType_PositionColorPointsize); loadDefaultGLProgram(p, kShaderType_PositionColorTextureAsPointsize);
_programs.insert( std::make_pair(GLProgram::SHADER_NAME_POSITION_COLOR_POINTSIZE, p) ); _programs.insert( std::make_pair(GLProgram::SHADER_NAME_POSITION_COLOR_TEXASPOINTSIZE, p) );
// //
// Position, Color shader no MVP // Position, Color shader no MVP
@ -261,9 +261,9 @@ void GLProgramCache::reloadDefaultGLPrograms()
loadDefaultGLProgram(p, kShaderType_PositionColor); loadDefaultGLProgram(p, kShaderType_PositionColor);
// Position, Color, PointSize shader // Position, Color, PointSize shader
p = getGLProgram(GLProgram::SHADER_NAME_POSITION_COLOR_POINTSIZE); p = getGLProgram(GLProgram::SHADER_NAME_POSITION_COLOR_TEXASPOINTSIZE);
p->reset(); p->reset();
loadDefaultGLProgram(p, kShaderType_PositionColorPointsize); loadDefaultGLProgram(p, kShaderType_PositionColorTextureAsPointsize);
// //
// Position, Color shader no MVP // Position, Color shader no MVP
@ -368,8 +368,8 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type)
case kShaderType_PositionColor: case kShaderType_PositionColor:
p->initWithByteArrays(ccPositionColor_vert ,ccPositionColor_frag); p->initWithByteArrays(ccPositionColor_vert ,ccPositionColor_frag);
break; break;
case kShaderType_PositionColorPointsize: case kShaderType_PositionColorTextureAsPointsize:
p->initWithByteArrays(ccPositionColorPointsize_vert ,ccPositionColor_frag); p->initWithByteArrays(ccPositionColorTextureAsPointsize_vert ,ccPositionColor_frag);
break; break;
case kShaderType_PositionColor_noMVP: case kShaderType_PositionColor_noMVP:
p->initWithByteArrays(ccPositionTextureColor_noMVP_vert ,ccPositionColor_frag); p->initWithByteArrays(ccPositionTextureColor_noMVP_vert ,ccPositionColor_frag);

7
cocos/renderer/ccShader_PositionColorPointsize.vert → cocos/renderer/ccShader_PositionColorTextureAsPointsize.vert
View File

@ -22,11 +22,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
const char* ccPositionColorPointsize_vert = STRINGIFY( const char* ccPositionColorTextureAsPointsize_vert = STRINGIFY(
attribute vec4 a_position; attribute vec4 a_position;
attribute vec4 a_color; attribute vec4 a_color;
attribute float a_pointSize;
attribute vec2 a_texCoord;
\n#ifdef GL_ES\n \n#ifdef GL_ES\n
varying lowp vec4 v_fragmentColor; varying lowp vec4 v_fragmentColor;
@ -37,7 +38,7 @@ varying vec4 v_fragmentColor;
void main() void main()
{ {
gl_Position = CC_MVPMatrix * a_position; gl_Position = CC_MVPMatrix * a_position;
gl_PointSize = a_pointSize; gl_PointSize = a_texCoord.x;
v_fragmentColor = a_color; v_fragmentColor = a_color;
} }
); );

2
cocos/renderer/ccShaders.cpp
View File

@ -43,7 +43,7 @@ NS_CC_BEGIN
#include "ccShader_PositionColor.vert" #include "ccShader_PositionColor.vert"
// //
#include "ccShader_PositionColorPointsize.vert" #include "ccShader_PositionColorTextureAsPointsize.vert"
// //
#include "ccShader_PositionTexture.frag" #include "ccShader_PositionTexture.frag"

2
cocos/renderer/ccShaders.h
View File

@ -42,7 +42,7 @@ extern CC_DLL const GLchar * ccPosition_uColor_vert;
extern CC_DLL const GLchar * ccPositionColor_frag; extern CC_DLL const GLchar * ccPositionColor_frag;
extern CC_DLL const GLchar * ccPositionColor_vert; extern CC_DLL const GLchar * ccPositionColor_vert;
extern CC_DLL const GLchar * ccPositionColorPointsize_vert; extern CC_DLL const GLchar * ccPositionColorTextureAsPointsize_vert;
extern CC_DLL const GLchar * ccPositionTexture_frag; extern CC_DLL const GLchar * ccPositionTexture_frag;
extern CC_DLL const GLchar * ccPositionTexture_vert; extern CC_DLL const GLchar * ccPositionTexture_vert;