mirror of
https://github.com/love2d/love.git
synced 2026-08-16 08:11:02 +02:00
Moved the appveyor script to a subfolder and updated it to properly choose Visual Studio 2012 and to create a post-build zip file.
This commit is contained in:
@@ -92,7 +92,7 @@ void OpenGL::setupContext()
|
||||
|
||||
GLint maxvertexattribs = 1;
|
||||
glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxvertexattribs);
|
||||
state.enabledAttribArrays = 1u << uint32(maxvertexattribs - 1);
|
||||
state.enabledAttribArrays = (uint32) ((1ull << uint32(maxvertexattribs)) - 1);
|
||||
useVertexAttribArrays(0);
|
||||
|
||||
// Get the current viewport.
|
||||
@@ -391,8 +391,8 @@ void OpenGL::useVertexAttribArrays(uint32 arraybits)
|
||||
state.enabledAttribArrays = arraybits;
|
||||
|
||||
// glDisableVertexAttribArray will make the constant value for a vertex
|
||||
// attribute undefined. We rely on the per-vertex color attribte being white
|
||||
// when no per-vertex color is used, so we set it here.
|
||||
// attribute undefined. We rely on the per-vertex color attribute being
|
||||
// white when no per-vertex color is used, so we set it here.
|
||||
// FIXME: Is there a better place to do this?
|
||||
if ((diff & ATTRIBFLAG_COLOR) && !(arraybits & ATTRIBFLAG_COLOR))
|
||||
glVertexAttrib4f(ATTRIB_COLOR, 1.0f, 1.0f, 1.0f, 1.0f);
|
||||
|
||||
@@ -63,7 +63,7 @@ static size_t vorbisRead(void *ptr /* ptr to the data that the vorbis files need
|
||||
if (actualSizeToRead)
|
||||
{
|
||||
// Copy the data from the start of the file PLUS how much we have already read in
|
||||
memcpy(ptr, (char *)vorbisData->dataPtr + vorbisData->dataRead, actualSizeToRead);
|
||||
memcpy(ptr, (const char *)vorbisData->dataPtr + vorbisData->dataRead, actualSizeToRead);
|
||||
// Increase by how much we have read by
|
||||
vorbisData->dataRead += (actualSizeToRead);
|
||||
}
|
||||
@@ -109,7 +109,7 @@ static int vorbisSeek(void *datasource /* ptr to the data that the vorbis files
|
||||
vorbisData->dataRead = vorbisData->dataSize+1;
|
||||
break;
|
||||
default:
|
||||
throw love::Exception("Unknown seek command in vorbisSeek\n");
|
||||
throw love::Exception("Unknown seek command in vorbisSeek");
|
||||
break;
|
||||
};
|
||||
|
||||
@@ -143,7 +143,7 @@ VorbisDecoder::VorbisDecoder(Data *data, const std::string &ext, int bufferSize)
|
||||
#endif
|
||||
|
||||
// Initialize OGG file
|
||||
oggFile.dataPtr = (char *) data->getData();
|
||||
oggFile.dataPtr = (const char *) data->getData();
|
||||
oggFile.dataSize = (int) data->getSize();
|
||||
oggFile.dataRead = 0;
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace lullaby
|
||||
// Struct for handling data
|
||||
struct SOggFile
|
||||
{
|
||||
char *dataPtr; // Pointer to the data in memory
|
||||
const char *dataPtr; // Pointer to the data in memory
|
||||
int dataSize; // Size of the data
|
||||
int dataRead; // How much we've read so far
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user