Skip to content

Nothing major happening here... #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnlnx wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −2
Open

Nothing major happening here... #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a17a03f
comments...comments
May 1, 2013
db3e445
merging changes from Kyle's push to upstream
May 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions render.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ typedef struct _render_target
/* C */
#ifdef __cplusplus
extern "C" {
#endif
#endif // __cplusplus

void render_init( device* device );
void render_draw_mesh( device* device, render_target* target, mesh* mesh, transform m );
Expand All @@ -52,9 +52,10 @@ shader* render_create_pixel_shader( device* device, const char* shader_source );

#ifdef __cplusplus
}
#endif
#endif // __cplusplus


#ifdef __cplusplus
/* C++ */

class render {
Expand All @@ -70,3 +71,5 @@ class render {
shader* create_vertex_shader( const char* shader_source );
shader* create_pixel_shader( const char* shader_source );
};

#endif // __cplusplus