Commit b83d6351 authored by Vincent Cheng's avatar Vincent Cheng

Imported Upstream version 0~20131127

parent 811e1e6f
......@@ -11,6 +11,8 @@ LIBDIR ?= lib
BUMBLEBEE_SOCKET ?= /var/run/bumblebee.socket
PRIMUS_SYNC ?= 0
PRIMUS_VERBOSE ?= 1
PRIMUS_UPLOAD ?= 0
PRIMUS_SLEEP ?= 90
PRIMUS_DISPLAY ?= :8
PRIMUS_LOAD_GLOBAL ?= libglapi.so.0
PRIMUS_libGLa ?= /usr/$$LIB/nvidia/libGL.so.1
......@@ -19,6 +21,8 @@ PRIMUS_libGLd ?= /usr/$$LIB/libGL.so.1
CXXFLAGS += -DBUMBLEBEE_SOCKET='"$(BUMBLEBEE_SOCKET)"'
CXXFLAGS += -DPRIMUS_SYNC='"$(PRIMUS_SYNC)"'
CXXFLAGS += -DPRIMUS_VERBOSE='"$(PRIMUS_VERBOSE)"'
CXXFLAGS += -DPRIMUS_UPLOAD='"$(PRIMUS_UPLOAD)"'
CXXFLAGS += -DPRIMUS_SLEEP='"$(PRIMUS_SLEEP)"'
CXXFLAGS += -DPRIMUS_DISPLAY='"$(PRIMUS_DISPLAY)"'
CXXFLAGS += -DPRIMUS_LOAD_GLOBAL='"$(PRIMUS_LOAD_GLOBAL)"'
CXXFLAGS += -DPRIMUS_libGLa='"$(PRIMUS_libGLa)"'
......
......@@ -3,6 +3,7 @@ DEF_GLX_PROTO(void, glGenBuffers, (GLsizei n, GLuint *buffers))
DEF_GLX_PROTO(void, glDeleteBuffers, (GLsizei n, const GLuint *buffers))
DEF_GLX_PROTO(void, glBindBuffer, (GLenum target, GLuint buffer))
DEF_GLX_PROTO(void, glBufferData, (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage))
DEF_GLX_PROTO(void, glBufferSubData, (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data))
DEF_GLX_PROTO(GLvoid*, glMapBuffer, (GLenum target, GLenum access))
DEF_GLX_PROTO(GLboolean,glUnmapBuffer,(GLenum target))
......
This diff is collapsed.
......@@ -8,6 +8,13 @@
# 0: only errors, 1: warnings (default), 2: profiling
# export PRIMUS_VERBOSE=${PRIMUS_VERBOSE:-1}
# Upload/display method
# 0: autodetect, 1: textures, 2: PBO/glDrawPixels (needs Mesa-10.1+)
# export PRIMUS_UPLOAD=${PRIMUS_UPLOAD:-0}
# Approximate sleep ratio in the readback thread, percent
# export PRIMUS_SLEEP=${PRIMUS_SLEEP:-90}
# Secondary display
# export PRIMUS_DISPLAY=${PRIMUS_DISPLAY:-:8}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment