NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'audio' of https://github.com/MeltyPlayer/libsm64-ext into audio

Browse Source
This commit is contained in:
MeltyPlayer
2022-10-24 03:02:39 -05:00
parent 0bfd2b9ed2 979de74e91
commit 2e2701688d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/main.c
+5 -5
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 ) static GLuint shader_compile( const char *shaderContents, size_t shaderContentsLength, GLenum shaderType )
{ {
const GLchar *shaderDefine = shaderType == GL_VERTEX_SHADER const GLchar *shaderDefine = shaderType == GL_VERTEX_SHADER
? "\n#version 410\n#define VERTEX \n#define v2f out\n" ? "\n#version 410\n#define VERTEX \n#define v2f out\n"
: "\n#version 410\n#define FRAGMENT\n#define v2f in \n"; : "\n#version 410\n#define FRAGMENT\n#define v2f in \n";
const GLchar *shaderStrings[2] = { shaderDefine, shaderContents }; const GLchar *shaderStrings[2] = { shaderDefine, shaderContents };
@@ -183,7 +183,7 @@ static GLuint shader_compile( const char *shaderContents, size_t shaderContentsL
GLint isCompiled; GLint isCompiled;
glGetShaderiv( shader, GL_COMPILE_STATUS, &isCompiled ); glGetShaderiv( shader, GL_COMPILE_STATUS, &isCompiled );
if( isCompiled == GL_FALSE ) if( isCompiled == GL_FALSE )
{ {
GLint maxLength; GLint maxLength;
glGetShaderiv( shader, GL_INFO_LOG_LENGTH, &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 ); uint8_t *texture = malloc( 4 * SM64_TEXTURE_WIDTH * SM64_TEXTURE_HEIGHT );
sm64_global_terminate(); sm64_global_terminate();
sm64_global_init( rom, texture, NULL ); sm64_global_init( rom, texture );
sm64_static_surfaces_load( surfaces, surfaces_count ); sm64_static_surfaces_load( surfaces, surfaces_count );
uint32_t marioId = sm64_mario_create( 0, 1000, 0 ); uint32_t marioId = sm64_mario_create( 0, 1000, 0 );
@@ -455,4 +455,4 @@ int main( void )
context_terminate(); context_terminate();
return 0; return 0;
} }