atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] Wayland display is OK, missing drag&drop, copy/paste, set icon, move windows, resize windows, grap mouse, grab mouse ouside windows

Browse Source
This commit is contained in:
Edouard DUPIN 2017-01-18 21:57:20 +01:00
parent c504a3fe0d
commit 0442aeba36
2 changed files with 257 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

281
gale/context/wayland/Context.cpp
View File

@ -121,6 +121,165 @@ static const struct wl_keyboard_listener keyboard_listener = {
}; };
/*
struct data_offer {
struct wl_data_offer *offer;
struct input *input;
struct wl_array types;
int refcount;
//struct task io_task;
int fd;
data_func_t func;
int32_t x, y;
uint32_t dnd_action;
uint32_t source_actions;
void *user_data;
};
static void data_offer_offer(void *data, struct wl_data_offer *wl_data_offer, const char *type) {
struct data_offer *offer = data;
char **p;
p = wl_array_add(&offer->types, sizeof *p);
*p = strdup(type);
}
static void data_offer_source_actions(void *data, struct wl_data_offer *wl_data_offer, uint32_t source_actions) {
struct data_offer *offer = data;
offer->source_actions = source_actions;
}
static void data_offer_action(void *data, struct wl_data_offer *wl_data_offer, uint32_t dnd_action) {
struct data_offer *offer = data;
offer->dnd_action = dnd_action;
}
static const struct wl_data_offer_listener data_offer_listener = {
data_offer_offer,
data_offer_source_actions,
data_offer_action
};
static void data_offer_destroy(struct data_offer *offer) {
char **p;
offer->refcount--;
if (offer->refcount == 0) {
wl_data_offer_destroy(offer->offer);
for (p = offer->types.data; *p; p++)
free(*p);
wl_array_release(&offer->types);
free(offer);
}
}
static void data_device_data_offer(void *data, struct wl_data_device *data_device, struct wl_data_offer *_offer) {
struct data_offer *offer;
offer = xmalloc(sizeof *offer);
wl_array_init(&offer->types);
offer->refcount = 1;
offer->input = data;
offer->offer = _offer;
wl_data_offer_add_listener(offer->offer, &data_offer_listener, offer);
}
static void data_device_enter(void *data, struct wl_data_device *data_device, uint32_t serial, struct wl_surface *surface, wl_fixed_t x_w, wl_fixed_t y_w, struct wl_data_offer *offer) {
struct input *input = data;
struct window *window;
void *types_data;
float x = wl_fixed_to_double(x_w);
float y = wl_fixed_to_double(y_w);
char **p;
window = wl_surface_get_user_data(surface);
input->drag_enter_serial = serial;
input->drag_focus = window,
input->drag_x = x;
input->drag_y = y;
if (!input->touch_grab) {
input->pointer_enter_serial = serial;
}
if (offer) {
input->drag_offer = wl_data_offer_get_user_data(offer);
p = wl_array_add(&input->drag_offer->types, sizeof *p);
*p = nullptr;
types_data = input->drag_offer->types.data;
if (input->display->data_device_manager_version >= WL_DATA_OFFER_SET_ACTIONS_SINCE_VERSION) {
wl_data_offer_set_actions(offer,
WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY
| WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE,
WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE);
}
} else {
input->drag_offer = nullptr;
types_data = nullptr;
}
if (window->data_handler) {
window->data_handler(window, input, x, y, types_data, window->user_data);
}
}
static void data_device_leave(void *data, struct wl_data_device *data_device) {
struct input *input = data;
if (input->drag_offer) {
data_offer_destroy(input->drag_offer);
input->drag_offer = nullptr;
}
}
static void data_device_motion(void *data, struct wl_data_device *data_device, uint32_t time, wl_fixed_t x_w, wl_fixed_t y_w) {
struct input *input = data;
struct window *window = input->drag_focus;
float x = wl_fixed_to_double(x_w);
float y = wl_fixed_to_double(y_w);
void *types_data;
input->drag_x = x;
input->drag_y = y;
if (input->drag_offer) {
types_data = input->drag_offer->types.data;
} else {
types_data = nullptr;
}
if (window->data_handler) {
window->data_handler(window, input, x, y, types_data, window->user_data);
}
}
static void data_device_drop(void *data, struct wl_data_device *data_device) {
struct input *input = data;
struct window *window = input->drag_focus;
float x, y;
x = input->drag_x;
y = input->drag_y;
if (window->drop_handler) {
window->drop_handler(window, input, x, y, window->user_data);
}
if (input->touch_grab) {
touch_ungrab(input);
}
}
static void data_device_selection(void *data, struct wl_data_device *wl_data_device, struct wl_data_offer *offer) {
struct input *input = data;
char **p;
if (input->selection_offer) {
data_offer_destroy(input->selection_offer);
}
if (offer) {
input->selection_offer = wl_data_offer_get_user_data(offer);
p = wl_array_add(&input->selection_offer->types, sizeof *p);
*p = nullptr;
} else {
input->selection_offer = nullptr;
}
}
static const struct wl_data_device_listener data_device_listener = {
data_device_data_offer,
data_device_enter,
data_device_leave,
data_device_motion,
data_device_drop,
data_device_selection
};
*/
/** /**
* @brief Wayland interface context to load specific context wrapper... * @brief Wayland interface context to load specific context wrapper...
*/ */
@ -136,6 +295,7 @@ class WAYLANDInterface : public gale::Context {
bool m_opaque; bool m_opaque;
enum gale::context::cursor m_cursorCurrent; //!< curent cursor enum gale::context::cursor m_cursorCurrent; //!< curent cursor
vec2 m_cursorCurrentPosition; vec2 m_cursorCurrentPosition;
char32_t m_lastKeyPressed;
// Wayland interface // Wayland interface
struct wl_display* m_display; struct wl_display* m_display;
@ -153,6 +313,8 @@ class WAYLANDInterface : public gale::Context {
struct wl_surface *m_surface; struct wl_surface *m_surface;
struct wl_shell_surface *m_shellSurface; struct wl_shell_surface *m_shellSurface;
struct wl_callback *m_callback; struct wl_callback *m_callback;
struct wl_data_device_manager* m_dataDeviceManager;
int32_t m_dataDeviceManagerVersion;
// EGL interface: // EGL interface:
EGLDisplay m_eglDisplay; EGLDisplay m_eglDisplay;
EGLContext m_eglContext; EGLContext m_eglContext;
@ -162,8 +324,6 @@ class WAYLANDInterface : public gale::Context {
struct xkb_context* m_XKBContext; struct xkb_context* m_XKBContext;
struct xkb_keymap* m_XKBKeymap; struct xkb_keymap* m_XKBKeymap;
struct xkb_state* m_XKBState; struct xkb_state* m_XKBState;
struct xkb_compose_table* m_XkbComposeTable;
struct xkb_compose_state* m_XkbComposeState;
#endif #endif
public: public:
WAYLANDInterface(gale::Application* _application, int32_t _argc, const char* _argv[]) : WAYLANDInterface(gale::Application* _application, int32_t _argc, const char* _argv[]) :
@ -174,6 +334,7 @@ class WAYLANDInterface : public gale::Context {
m_configured(false), m_configured(false),
m_opaque(false), m_opaque(false),
m_cursorCurrent(gale::context::cursor::leftArrow), m_cursorCurrent(gale::context::cursor::leftArrow),
m_lastKeyPressed(0),
m_display(nullptr), m_display(nullptr),
m_registry(nullptr), m_registry(nullptr),
m_compositor(nullptr), m_compositor(nullptr),
@ -188,13 +349,13 @@ class WAYLANDInterface : public gale::Context {
m_eglWindow(nullptr), m_eglWindow(nullptr),
m_surface(nullptr), m_surface(nullptr),
m_shellSurface(nullptr), m_shellSurface(nullptr),
m_callback(nullptr) m_callback(nullptr),
m_dataDeviceManager(nullptr),
m_dataDeviceManagerVersion(0)
#ifdef GALE_XKB_WRAPPER_INPUT #ifdef GALE_XKB_WRAPPER_INPUT
,m_XKBContext(nullptr), ,m_XKBContext(nullptr),
m_XKBKeymap(nullptr), m_XKBKeymap(nullptr),
m_XKBState(nullptr), m_XKBState(nullptr)
m_XkbComposeTable(nullptr),
m_XkbComposeState(nullptr)
#endif #endif
{ {
// in case ... // in case ...
@ -208,11 +369,6 @@ class WAYLANDInterface : public gale::Context {
if (m_XKBContext == nullptr) { if (m_XKBContext == nullptr) {
GALE_CRITICAL("Couldn't create xkb context"); GALE_CRITICAL("Couldn't create xkb context");
} }
m_XkbComposeTable = xkb_compose_table_new(m_XKBContext, XKB_COMPOSE_COMPILE_NO_FLAGS);
if (m_XkbComposeTable == nullptr) {
GALE_CRITICAL("Couldn't create xkb compose table");
}
m_XkbComposeState = xkb_compose_state_new(m_XkbComposeTable, XKB_COMPOSE_STATE_NO_FLAGS);
#endif #endif
m_display = wl_display_connect(nullptr); m_display = wl_display_connect(nullptr);
assert(m_display); assert(m_display);
@ -259,6 +415,9 @@ class WAYLANDInterface : public gale::Context {
if (m_compositor) { if (m_compositor) {
wl_compositor_destroy(m_compositor); wl_compositor_destroy(m_compositor);
} }
if (m_dataDeviceManager) {
wl_data_device_manager_destroy(m_dataDeviceManager);
}
wl_registry_destroy(m_registry); wl_registry_destroy(m_registry);
wl_display_flush(m_display); wl_display_flush(m_display);
wl_display_disconnect(m_display); wl_display_disconnect(m_display);
@ -394,6 +553,9 @@ class WAYLANDInterface : public gale::Context {
m_shm = (struct wl_shm*)wl_registry_bind(_registry, _id, &wl_shm_interface, 1); m_shm = (struct wl_shm*)wl_registry_bind(_registry, _id, &wl_shm_interface, 1);
m_cursorTheme = wl_cursor_theme_load(nullptr, 32, m_shm); m_cursorTheme = wl_cursor_theme_load(nullptr, 32, m_shm);
m_cursorDefault = wl_cursor_theme_get_cursor(m_cursorTheme, "left_ptr"); m_cursorDefault = wl_cursor_theme_get_cursor(m_cursorTheme, "left_ptr");
} else if (strcmp(_interface, "wl_data_device_manager") == 0) {
m_dataDeviceManagerVersion = std::min(3, int32_t(_version));
m_dataDeviceManager = (struct wl_data_device_manager*)wl_registry_bind(_registry, _id, &wl_data_device_manager_interface, m_dataDeviceManagerVersion);
} else { } else {
GALE_WARNING(" ==> Not used ..."); GALE_WARNING(" ==> Not used ...");
} }
@ -464,7 +626,7 @@ class WAYLANDInterface : public gale::Context {
GALE_VERBOSE("Pointer left surface" << _surface); GALE_VERBOSE("Pointer left surface" << _surface);
} }
void pointerHandleMotion(struct wl_pointer* _pointer, uint32_t _time, ivec2 _pos) { void pointerHandleMotion(struct wl_pointer* _pointer, uint32_t _time, ivec2 _pos) {
m_cursorCurrentPosition = vec2(_pos.x(), _pos.y()); m_cursorCurrentPosition = vec2(_pos.x(), m_size.y()-_pos.y());
bool findPointer = false; bool findPointer = false;
for (int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) { for (int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
if (m_inputIsPressed[iii] == true) { if (m_inputIsPressed[iii] == true) {
@ -546,9 +708,7 @@ class WAYLANDInterface : public gale::Context {
if (m_configured == false) { if (m_configured == false) {
return; return;
} }
bool hasDisplay = OS_Draw(true); bool hasDisplay = OS_Draw(true);
if ( m_opaque == true if ( m_opaque == true
|| m_fullscreen == true) { || m_fullscreen == true) {
struct wl_region *region = (struct wl_region *)wl_compositor_create_region(m_compositor); struct wl_region *region = (struct wl_region *)wl_compositor_create_region(m_compositor);
@ -633,7 +793,7 @@ class WAYLANDInterface : public gale::Context {
void keyboardLeave(struct wl_keyboard* _keyboard, uint32_t _serial, struct wl_surface* _surface) { void keyboardLeave(struct wl_keyboard* _keyboard, uint32_t _serial, struct wl_surface* _surface) {
GALE_INFO("keyboardLeave..."); GALE_INFO("keyboardLeave...");
} }
#ifdef GALE_XKB_WRAPPER_INPUT #if 0
void test_print_keycode_state(struct xkb_state* _state, void test_print_keycode_state(struct xkb_state* _state,
struct xkb_compose_state* _composeState, struct xkb_compose_state* _composeState,
xkb_keycode_t _keycode, xkb_keycode_t _keycode,
@ -651,21 +811,8 @@ class WAYLANDInterface : public gale::Context {
return; return;
} }
status = XKB_COMPOSE_NOTHING; status = XKB_COMPOSE_NOTHING;
if (_composeState) { sym = xkb_state_key_get_one_sym(_state, _keycode);
status = xkb_compose_state_get_status(_composeState); syms = &sym;
}
if ( status == XKB_COMPOSE_COMPOSING
|| status == XKB_COMPOSE_CANCELLED) {
return;
}
if (status == XKB_COMPOSE_COMPOSED) {
sym = xkb_compose_state_get_one_sym(_composeState);
syms = &sym;
nsyms = 1;
} else if (nsyms == 1) {
sym = xkb_state_key_get_one_sym(_state, _keycode);
syms = &sym;
}
printf("keysyms [ "); printf("keysyms [ ");
for (int i = 0; i < nsyms; i++) { for (int i = 0; i < nsyms; i++) {
xkb_keysym_get_name(syms[i], s, sizeof(s)); xkb_keysym_get_name(syms[i], s, sizeof(s));
@ -673,11 +820,7 @@ class WAYLANDInterface : public gale::Context {
} }
printf("] "); printf("] ");
if (status == XKB_COMPOSE_COMPOSED) { xkb_state_key_get_utf8(_state, _keycode, s, sizeof(s));
xkb_compose_state_get_utf8(_composeState, s, sizeof(s));
}else {
xkb_state_key_get_utf8(_state, _keycode, s, sizeof(s));
}
printf("unicode [ %s ] ", s); printf("unicode [ %s ] ", s);
layout = xkb_state_key_get_layout(_state, _keycode); layout = xkb_state_key_get_layout(_state, _keycode);
printf("layout [ %s (%d) ] ", printf("layout [ %s (%d) ] ",
@ -709,14 +852,13 @@ class WAYLANDInterface : public gale::Context {
} }
#endif #endif
void keyboardKey(struct wl_keyboard* _keyboard, uint32_t _serial, uint32_t _time, uint32_t _key, bool _isDown) { void keyboardKey(struct wl_keyboard* _keyboard, uint32_t _serial, uint32_t _time, uint32_t _key, bool _isDown) {
#ifdef GALE_XKB_WRAPPER_INPUT #if 0
if (_isDown == true) { if (_isDown == true) {
test_print_keycode_state(m_XKBState, m_XkbComposeState, _key + 8, XKB_CONSUMED_MODE_GTK); test_print_keycode_state(m_XKBState, nullptr, _key + 8, XKB_CONSUMED_MODE_GTK);
/* Exit on ESC. */ /* Exit on ESC. */
if (xkb_state_key_get_one_sym(m_XKBState, _key + 8) == XKB_KEY_Escape) { if (xkb_state_key_get_one_sym(m_XKBState, _key + 8) == XKB_KEY_Escape) {
m_run = false; m_run = false;
} }
xkb_keysym_t sym = xkb_state_key_get_one_sym(m_XKBState, _key + 8);
} }
#endif #endif
GALE_INFO("KEY : '" << _key << "' _isDown=" << _isDown); GALE_INFO("KEY : '" << _key << "' _isDown=" << _isDown);
@ -802,45 +944,43 @@ class WAYLANDInterface : public gale::Context {
0x09); 0x09);
break; break;
default: default:
find = false;
{ {
// must use xkbcommon library to manage correct map ... xkb_keysym_t sym = xkb_state_key_get_one_sym(m_XKBState, _key + 8);
/* char buf[16];
char buf[11]; xkb_state_key_get_utf8(m_XKBState, _key + 8, buf, 16);
//GALE_DEBUG("Keycode: " << event.xkey.keycode); if (buf[0] != '\0') {
// change keystate for simple reson of the ctrl error... //GALE_INFO("KEY : val='" << buf << "' _isDown=" << _isDown);
int32_t keyStateSave = event.xkey.state; m_lastKeyPressed = utf8::convertChar32(buf);
if (event.xkey.state & (1<<2) ) { //GALE_INFO("KEY : val='" << buf << "'='" << m_lastKeyPressed <<"' _isDown=" << _isDown);
event.xkey.state = event.xkey.state & 0xFFFFFFFB;
}
KeySym keysym;
Status status = 0;
//int count = Xutf8LookupString(m_xic, (XKeyPressedEvent*)&event, buf, 10, &keysym, &status);
int count = Xutf8LookupString(m_xic, &event.xkey, buf, 10, &keysym, &status);
// retreave real keystate
event.xkey.state = keyStateSave;
buf[count] = '\0';
// Replace \r error ...
if (buf[0] == '\r') {
buf[0] = '\n';
buf[1] = '\0';
}
if (count >= 0) {
// repeated kay from previous element :
if (count > 0) {
// transform it in unicode
m_lastKeyPressed = utf8::convertChar32(buf);
}
X11_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << m_lastKeyPressed);
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
gale::key::keyboard::character, gale::key::keyboard::character,
(event.type==KeyPress?gale::key::status::down:gale::key::status::up), (_isDown==true?gale::key::status::down:gale::key::status::up),
false, false,
m_lastKeyPressed); m_lastKeyPressed);
m_lastKeyPressed = 0;
} else { } else {
GALE_WARNING("Unknow event Key : " << event.xkey.keycode << " res='" << buf << "' repeate=" << thisIsAReapeateKey); find = true;
switch(sym) {
case XKB_KEY_dead_circumflex: m_lastKeyPressed = '^'; break;
case XKB_KEY_dead_diaeresis: m_lastKeyPressed = '"'; break;
//case XKB_KEY_ISO_Level3_Shif: m_lastKeyPressed = '~'; break;
//case XKB_KEY_: m_lastKeyPressed = ''; break;
default:
GALE_ERROR("UNKNOW KEY : sym='" << sym << "' _isDown=" << _isDown);
find = false;
break;
}
if (find == false) {
//GALE_INFO("KEY : sym='" << sym << "' _isDown=" << _isDown);
} else {
OS_setKeyboard(m_guiKeyBoardMode,
gale::key::keyboard::character,
(_isDown==true?gale::key::status::down:gale::key::status::up),
false,
m_lastKeyPressed);
}
} }
*/ // must use xkbcommon library to manage correct map ...
} }
} }
} }
@ -1513,3 +1653,4 @@ int gale::run(gale::Application* _application, int _argc, const char *_argv[]) {
return retValue; return retValue;
} }

64
gale/renderer/openGL/openGL.cpp
View File

@ -27,6 +27,8 @@ static void checkGlError(const char* _op, int32_t _localLine) {
} }
#endif #endif
} }
#define CHECK_GL_ERROR(cmd,line) do { } while (false)
//#define CHECK_GL_ERROR(cmd,line) checkGlError(cmd,line)
#define OPENGL_ERROR(data) do { } while (false) #define OPENGL_ERROR(data) do { } while (false)
//#define OPENGL_ERROR(data) GALE_ERROR(data) //#define OPENGL_ERROR(data) GALE_ERROR(data)
@ -117,7 +119,6 @@ void gale::openGL::threadHasNoMoreContext() {
} else { } else {
GALE_ERROR("rm openGL context associate with threadID that is not registered."); GALE_ERROR("rm openGL context associate with threadID that is not registered.");
} }
mutexOpenGl().unlock(); mutexOpenGl().unlock();
} }
@ -191,6 +192,7 @@ void gale::openGL::flush() {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glFlush(); glFlush();
checkGlError("glFlush", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -209,6 +211,7 @@ void gale::openGL::setViewPort(const ivec2& _start, const ivec2& _stop) {
#endif #endif
OPENGL_INFO("setViewport " << _start << " " << _stop); OPENGL_INFO("setViewport " << _start << " " << _stop);
glViewport(_start.x(), _start.y(), _stop.x(), _stop.y()); glViewport(_start.x(), _start.y(), _stop.x(), _stop.y());
CHECK_GL_ERROR("glViewport", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -220,6 +223,7 @@ void gale::openGL::setViewPort(const vec2& _start, const vec2& _stop) {
#endif #endif
OPENGL_INFO("setViewport " << _start << " " << _stop); OPENGL_INFO("setViewport " << _start << " " << _stop);
glViewport(_start.x(), _start.y(), _stop.x(), _stop.y()); glViewport(_start.x(), _start.y(), _stop.x(), _stop.y());
CHECK_GL_ERROR("glViewport", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -243,6 +247,7 @@ void gale::openGL::clearColor(const etk::Color<float>& _color) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glClearColor(_color.r(), _color.g(), _color.b(), _color.a()); glClearColor(_color.r(), _color.g(), _color.b(), _color.a());
CHECK_GL_ERROR("glClearColor", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -254,9 +259,11 @@ void gale::openGL::clearDepth(float _value) {
#endif #endif
#if !((defined(__TARGET_OS__Android) || defined(__TARGET_OS__IOs))) #if !((defined(__TARGET_OS__Android) || defined(__TARGET_OS__IOs)))
glClearDepth(_value); glClearDepth(_value);
CHECK_GL_ERROR("glClearDepth", __LINE__);
#endif #endif
#if defined(__TARGET_OS__IOs) #if defined(__TARGET_OS__IOs)
glClearDepthf(_value); glClearDepthf(_value);
CHECK_GL_ERROR("glClearDepthf", __LINE__);
#endif #endif
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
@ -267,6 +274,7 @@ void gale::openGL::clearStencil(int32_t _value) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glClearStencil(_value); glClearStencil(_value);
CHECK_GL_ERROR("glClearStencil", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -283,6 +291,7 @@ void gale::openGL::clear(uint32_t _flags) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glClear(field); glClear(field);
CHECK_GL_ERROR("glClear", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -469,8 +478,9 @@ void gale::openGL::enable(enum gale::openGL::flag _flagID) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
for (int32_t iii=0; iii<basicFlagCount ; iii++) { for (int32_t iii=0; iii<basicFlagCount ; iii++) {
if ( basicFlag[iii].curentFlag == (uint32_t)_flagID ) { if (basicFlag[iii].curentFlag == (uint32_t)_flagID) {
glEnable(basicFlag[iii].OGlFlag); glEnable(basicFlag[iii].OGlFlag);
CHECK_GL_ERROR("glEnable", __LINE__);
} }
} }
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
@ -487,11 +497,12 @@ void gale::openGL::disable(enum gale::openGL::flag _flagID) {
//GALE_INFO("Disable : " << _flagID); //GALE_INFO("Disable : " << _flagID);
#ifdef DIRECT_MODE #ifdef DIRECT_MODE
for (int32_t iii=0; iii<basicFlagCount ; iii++) { for (int32_t iii=0; iii<basicFlagCount ; iii++) {
if ( basicFlag[iii].curentFlag == (uint32_t)_flagID ) { if (basicFlag[iii].curentFlag == (uint32_t)_flagID) {
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDisable(basicFlag[iii].OGlFlag); glDisable(basicFlag[iii].OGlFlag);
CHECK_GL_ERROR("glDisable", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -522,6 +533,7 @@ void gale::openGL::updateAllFlags() {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glEnable(basicFlag[iii].OGlFlag); glEnable(basicFlag[iii].OGlFlag);
CHECK_GL_ERROR("glEnable", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -531,6 +543,7 @@ void gale::openGL::updateAllFlags() {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDisable(basicFlag[iii].OGlFlag); glDisable(basicFlag[iii].OGlFlag);
CHECK_GL_ERROR("glDisable", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -548,6 +561,7 @@ void gale::openGL::activeTexture(uint32_t _flagID) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glActiveTexture(_flagID); glActiveTexture(_flagID);
CHECK_GL_ERROR("glActiveTexture", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -590,6 +604,7 @@ void gale::openGL::drawArrays(enum gale::openGL::renderMode _mode, int32_t _firs
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDrawArrays(convertRenderMode[uint32_t(_mode)], _first, _count); glDrawArrays(convertRenderMode[uint32_t(_mode)], _first, _count);
CHECK_GL_ERROR("glDrawArrays", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -604,6 +619,7 @@ void gale::openGL::drawElements(enum renderMode _mode, const std::vector<uint32_
#endif #endif
//GALE_DEBUG("Request draw of " << indices.size() << "elements"); //GALE_DEBUG("Request draw of " << indices.size() << "elements");
glDrawElements(convertRenderMode[uint32_t(_mode)], _indices.size(), GL_UNSIGNED_INT, &_indices[0]); glDrawElements(convertRenderMode[uint32_t(_mode)], _indices.size(), GL_UNSIGNED_INT, &_indices[0]);
CHECK_GL_ERROR("glDrawElements", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -617,6 +633,7 @@ void gale::openGL::drawElements16(enum renderMode _mode, const std::vector<uint1
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDrawElements(convertRenderMode[uint32_t(_mode)], _indices.size(), GL_UNSIGNED_SHORT, &_indices[0]); glDrawElements(convertRenderMode[uint32_t(_mode)], _indices.size(), GL_UNSIGNED_SHORT, &_indices[0]);
CHECK_GL_ERROR("glDrawElements", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -630,6 +647,7 @@ void gale::openGL::drawElements8(enum renderMode _mode, const std::vector<uint8_
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDrawElements(convertRenderMode[uint32_t(_mode)], _indices.size(), GL_UNSIGNED_BYTE, &_indices[0]); glDrawElements(convertRenderMode[uint32_t(_mode)], _indices.size(), GL_UNSIGNED_BYTE, &_indices[0]);
CHECK_GL_ERROR("glDrawElements", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -676,11 +694,11 @@ void gale::openGL::useProgram(int32_t _id) {
#endif #endif
} }
#endif #endif
#if 0 #if 1
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
checkGlError("glUseProgram", __LINE__); CHECK_GL_ERROR("glUseProgram", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -700,7 +718,7 @@ bool gale::openGL::genBuffers(std::vector<uint32_t>& _buffers) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glGenBuffers(_buffers.size(), &_buffers[0]); glGenBuffers(_buffers.size(), &_buffers[0]);
checkGlError("glGenBuffers", __LINE__); CHECK_GL_ERROR("glGenBuffers", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -723,7 +741,7 @@ bool gale::openGL::deleteBuffers(std::vector<uint32_t>& _buffers) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDeleteBuffers(_buffers.size(), &_buffers[0]); glDeleteBuffers(_buffers.size(), &_buffers[0]);
checkGlError("glDeleteBuffers", __LINE__); CHECK_GL_ERROR("glDeleteBuffers", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -738,7 +756,7 @@ bool gale::openGL::bindBuffer(uint32_t _bufferId) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glBindBuffer(GL_ARRAY_BUFFER, _bufferId); glBindBuffer(GL_ARRAY_BUFFER, _bufferId);
checkGlError("glBindBuffer", __LINE__); CHECK_GL_ERROR("glBindBuffer", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -756,7 +774,7 @@ bool gale::openGL::bufferData(size_t _size, const void* _data, enum gale::openGL
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glBufferData(GL_ARRAY_BUFFER, _size, _data, convertUsage[uint32_t(_usage)]); glBufferData(GL_ARRAY_BUFFER, _size, _data, convertUsage[uint32_t(_usage)]);
checkGlError("glBufferData", __LINE__); CHECK_GL_ERROR("glBufferData", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -768,7 +786,7 @@ bool gale::openGL::unbindBuffer() {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
checkGlError("glBindBuffer(0)", __LINE__); CHECK_GL_ERROR("glBindBuffer(0)", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -836,6 +854,7 @@ void gale::openGL::shader::remove(int64_t& _shader) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDeleteShader(GLuint(_shader)); glDeleteShader(GLuint(_shader));
CHECK_GL_ERROR("glDeleteShader", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -848,9 +867,12 @@ bool gale::openGL::shader::compile(int64_t _shader, const std::string& _data) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glShaderSource(GLuint(_shader), 1, (const char**)&data, nullptr); glShaderSource(GLuint(_shader), 1, (const char**)&data, nullptr);
CHECK_GL_ERROR("glShaderSource", __LINE__);
glCompileShader(GLuint(_shader)); glCompileShader(GLuint(_shader));
CHECK_GL_ERROR("glCompileShader", __LINE__);
GLint compiled = 0; GLint compiled = 0;
glGetShaderiv(GLuint(_shader), GL_COMPILE_STATUS, &compiled); glGetShaderiv(GLuint(_shader), GL_COMPILE_STATUS, &compiled);
CHECK_GL_ERROR("glGetShaderiv", __LINE__);
if (!compiled) { if (!compiled) {
GLint infoLen = 0; GLint infoLen = 0;
l_bufferDisplayError[0] = '\0'; l_bufferDisplayError[0] = '\0';
@ -877,7 +899,7 @@ int64_t gale::openGL::program::create() {
program = glCreateProgram(); program = glCreateProgram();
if (program == 0) { if (program == 0) {
GALE_ERROR("program creation return error ..."); GALE_ERROR("program creation return error ...");
checkGlError("glCreateProgram", __LINE__); CHECK_GL_ERROR("glCreateProgram", __LINE__);
return -1; return -1;
} }
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
@ -898,7 +920,7 @@ void gale::openGL::program::remove(int64_t& _prog) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glDeleteProgram(GLuint(_prog)); glDeleteProgram(GLuint(_prog));
checkGlError("glDeleteProgram", __LINE__); CHECK_GL_ERROR("glDeleteProgram", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -918,7 +940,7 @@ bool gale::openGL::program::attach(int64_t _prog, int64_t _shader) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glAttachShader(GLuint(_prog), GLuint(_shader)); glAttachShader(GLuint(_prog), GLuint(_shader));
checkGlError("glAttachShader", __LINE__); CHECK_GL_ERROR("glAttachShader", __LINE__);
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif
@ -933,10 +955,10 @@ bool gale::openGL::program::compile(int64_t _prog) {
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
glLinkProgram(GLuint(_prog)); glLinkProgram(GLuint(_prog));
checkGlError("glLinkProgram", __LINE__); CHECK_GL_ERROR("glLinkProgram", __LINE__);
GLint linkStatus = GL_FALSE; GLint linkStatus = GL_FALSE;
glGetProgramiv(GLuint(_prog), GL_LINK_STATUS, &linkStatus); glGetProgramiv(GLuint(_prog), GL_LINK_STATUS, &linkStatus);
checkGlError("glGetProgramiv", __LINE__); CHECK_GL_ERROR("glGetProgramiv", __LINE__);
if (linkStatus != GL_TRUE) { if (linkStatus != GL_TRUE) {
GLint bufLength = 0; GLint bufLength = 0;
l_bufferDisplayError[0] = '\0'; l_bufferDisplayError[0] = '\0';
@ -986,7 +1008,7 @@ int32_t gale::openGL::program::getAttributeLocation(int64_t _prog, const std::st
#endif #endif
val = glGetAttribLocation(GLuint(_prog), _name.c_str()); val = glGetAttribLocation(GLuint(_prog), _name.c_str());
if (val < 0) { if (val < 0) {
checkGlError("glGetAttribLocation", __LINE__); CHECK_GL_ERROR("glGetAttribLocation", __LINE__);
GALE_WARNING("glGetAttribLocation(\"" << _name << "\") = " << val); GALE_WARNING("glGetAttribLocation(\"" << _name << "\") = " << val);
} }
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
@ -1009,8 +1031,14 @@ int32_t gale::openGL::program::getUniformLocation(int64_t _prog, const std::stri
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
val = glGetUniformLocation(GLuint(_prog), _name.c_str()); val = glGetUniformLocation(GLuint(_prog), _name.c_str());
if (val < 0) { if (val == GL_INVALID_VALUE) {
checkGlError("glGetUniformLocation", __LINE__); CHECK_GL_ERROR("glGetUniformLocation", __LINE__);
GALE_WARNING("glGetUniformLocation(\"" << _name << "\") = GL_INVALID_VALUE");
} else if (val == GL_INVALID_OPERATION) {
CHECK_GL_ERROR("glGetUniformLocation", __LINE__);
GALE_WARNING("glGetUniformLocation(\"" << _name << "\") = GL_INVALID_OPERATION");
} else if (val < 0) {
CHECK_GL_ERROR("glGetUniformLocation", __LINE__);
GALE_WARNING("glGetUniformLocation(\"" << _name << "\") = " << val); GALE_WARNING("glGetUniformLocation(\"" << _name << "\") = " << val);
} }
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE