sm64-mirrors/libsm64
1
0
Fork 0
mirror of https://github.com/libsm64/libsm64.git synced 2025-01-22 15:43:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'libsm64:master' into audio

Browse source
This commit is contained in:
MeltyPlayer 2022-10-24 03:00:05 -05:00 committed by GitHub
commit 979de74e91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/main.c
View file

@ -170,8 +170,8 @@ uint8_t *utils_read_file_alloc( const char *path, size_t *fileLength )
static GLuint shader_compile( const char *shaderContents, size_t shaderContentsLength, GLenum shaderType )
{
const GLchar *shaderDefine = shaderType == GL_VERTEX_SHADER
? "\n#version 410\n#define VERTEX \n#define v2f out\n"
const GLchar *shaderDefine = shaderType == GL_VERTEX_SHADER
? "\n#version 410\n#define VERTEX \n#define v2f out\n"
: "\n#version 410\n#define FRAGMENT\n#define v2f in \n";
const GLchar *shaderStrings[2] = { shaderDefine, shaderContents };
@ -183,7 +183,7 @@ static GLuint shader_compile( const char *shaderContents, size_t shaderContentsL
GLint isCompiled;
glGetShaderiv( shader, GL_COMPILE_STATUS, &isCompiled );
if( isCompiled == GL_FALSE )
if( isCompiled == GL_FALSE )
{
GLint maxLength;
glGetShaderiv( shader, GL_INFO_LOG_LENGTH, &maxLength );
@ -393,7 +393,7 @@ int main( void )
uint8_t *texture = malloc( 4 * SM64_TEXTURE_WIDTH * SM64_TEXTURE_HEIGHT );
sm64_global_terminate();
sm64_global_init( rom, texture, NULL );
sm64_global_init( rom, texture );
sm64_static_surfaces_load( surfaces, surfaces_count );
uint32_t marioId = sm64_mario_create( 0, 1000, 0 );
@ -455,4 +455,4 @@ int main( void )
context_terminate();
return 0;
}
}