6502/erc-c
1
0
Fork 0
mirror of https://github.com/pevans/erc-c.git synced 2024-12-21 23:29:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove references to OpenGL/GLFW/GLEW

Browse Source
This commit is contained in:
Peter Evans 2017-12-17 20:20:11 -06:00
parent afa07e346f
commit ad37d59b2d
4 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -27,4 +27,4 @@ link_directories(/usr/local/lib)
add_executable(erc ${sources} src/main.c) add_executable(erc ${sources} src/main.c)
# Graphics # Graphics
target_link_libraries(erc ${opengl_library} glfw GLEW) target_link_libraries(erc)

4
include/vm_screen.h
View File

@ -1,8 +1,6 @@
#ifndef _VM_SCREEN_H_ #ifndef _VM_SCREEN_H_
#define _VM_SCREEN_H_ #define _VM_SCREEN_H_
#include <GL/glew.h>
#include <GLFW/glfw3.h>
#include <stdbool.h> #include <stdbool.h>
#define VM_SCREEN_DEFWIDTH 800 #define VM_SCREEN_DEFWIDTH 800
@ -17,8 +15,6 @@
vm_screen_draw_rect(screen, xpos, ypos, 1, 1) vm_screen_draw_rect(screen, xpos, ypos, 1, 1)
typedef struct { typedef struct {
GLFWwindow *window;
/* /*
* These form the components of an RGBA composite color. * These form the components of an RGBA composite color.
*/ */

54
src/vm_screen.c
View File

@ -12,47 +12,15 @@
#include "log.h" #include "log.h"
#include "vm_screen.h" #include "vm_screen.h"
/*
* Something to help us remember if we've already initialized glew or
* not.
*/
static bool init_glew = false;
/*
* Initialize the glew library, if it is needed -- it may not be.
*/
static void
glew_init()
{
if (!init_glew) {
glewExperimental = GL_TRUE;
glewInit();
init_glew = true;
}
}
int int
vm_screen_init() vm_screen_init()
{ {
if (!glfwInit()) {
return ERR_GFXINIT;
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_RESIZABLE, GL_FALSE);
return OK; return OK;
} }
void void
vm_screen_finish() vm_screen_finish()
{ {
glfwTerminate();
} }
/* /*
@ -76,21 +44,6 @@ vm_screen_create()
int int
vm_screen_add_window(vm_screen *screen) vm_screen_add_window(vm_screen *screen)
{ {
screen->window = glfwCreateWindow(VM_SCREEN_DEFWIDTH,
VM_SCREEN_DEFHEIGHT,
"erc", NULL, NULL);
if (screen->window == NULL) {
log_critical("Could not create a window");
return ERR_GFXINIT;
}
glfwMakeContextCurrent(screen->window);
// glew can only be initialized _after_ the window is built; if you
// do so beforehand, you will be rudely presented with a segfault.
glew_init();
return OK; return OK;
} }
@ -106,17 +59,12 @@ vm_screen_free(vm_screen *screen)
bool bool
vm_screen_active(vm_screen *screen) vm_screen_active(vm_screen *screen)
{ {
return !glfwWindowShouldClose(screen->window); return false;
} }
void void
vm_screen_refresh(vm_screen *screen) vm_screen_refresh(vm_screen *screen)
{ {
glClear(GL_COLOR_BUFFER_BIT);
glfwSwapBuffers(screen->window);
glfwPollEvents();
} }
/* /*

2
tests/CMakeLists.txt
View File

@ -33,4 +33,4 @@ add_executable(erc-test ${sources} ${test_sources})
target_link_libraries(erc-test criterion) target_link_libraries(erc-test criterion)
# Graphics # Graphics
target_link_libraries(erc-test ${opengl_library} glfw) target_link_libraries(erc-test)