equal
deleted
inserted
replaced
87 } |
87 } |
88 else |
88 else |
89 { |
89 { |
90 if(type == DGLES2_TYPE_INT) |
90 if(type == DGLES2_TYPE_INT) |
91 { |
91 { |
92 ctx->hgl.GetVertexAttribiv(index, GL_CURRENT_VERTEX_ATTRIB, params); |
92 ctx->hgl.GetVertexAttribiv(index, GL_CURRENT_VERTEX_ATTRIB, (GLint*)params); |
93 } |
93 } |
94 else |
94 else |
95 { |
95 { |
96 DGLES2_ASSERT(type == DGLES2_TYPE_FLOAT); |
96 DGLES2_ASSERT(type == DGLES2_TYPE_FLOAT); |
97 ctx->hgl.GetVertexAttribfv(index, GL_CURRENT_VERTEX_ATTRIB, params); |
97 ctx->hgl.GetVertexAttribfv(index, GL_CURRENT_VERTEX_ATTRIB, (GLfloat*)params); |
98 } |
98 } |
99 } |
99 } |
100 return GL_TRUE; |
100 return GL_TRUE; |
101 |
101 |
102 default: |
102 default: |
163 Dprintf("Converting %d fixed/half float indices to float.\n", count); |
163 Dprintf("Converting %d fixed/half float indices to float.\n", count); |
164 # endif |
164 # endif |
165 |
165 |
166 if(va->floatptr) free(va->floatptr); |
166 if(va->floatptr) free(va->floatptr); |
167 |
167 |
168 va->floatptr = malloc(sizeof(GLfloat)*count*va->size); |
168 va->floatptr = (GLfloat*)malloc(sizeof(GLfloat)*count*va->size); |
169 { |
169 { |
170 GLsizei j; |
170 GLsizei j; |
171 for(j = 0; j < count; ++j) |
171 for(j = 0; j < count; ++j) |
172 { |
172 { |
173 signed k; |
173 signed k; |
447 va->buffer = DGLContext_findBuffer(ctx, ctx->buffer_binding); |
447 va->buffer = DGLContext_findBuffer(ctx, ctx->buffer_binding); |
448 } |
448 } |
449 } |
449 } |
450 DGLES2_LEAVE(); |
450 DGLES2_LEAVE(); |
451 } |
451 } |
452 |
|