src/timer/haiku/SDL_systimer.c
author Sam Lantinga
Fri, 27 Jan 2017 21:23:27 -0800
changeset 10861 71d8f9afb690
parent 10737 3406a0f8b041
child 11164 3862687cef22
permissions -rw-r--r--
Fixed bug 3569 - GL_UpdateViewport leaves PROJECTION matrix selected

Tom Seddon

GL_ActivateRenderer may call GL_UpdateViewport, which leaves the GL_PROJECTION matrix selected. But after GL_ResetState, the GL_MODELVIEW matrix is selected, suggesting that's the intended default state.

It seems at least like these should be consistent. Presumably GL_UpdateViewport should be doing a glMatrixMode(GL_MODELVIEW) before it finishes.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "../../SDL_internal.h"
    22 
    23 #ifdef SDL_TIMER_HAIKU
    24 
    25 #include <os/kernel/OS.h>
    26 
    27 #include "SDL_timer.h"
    28 
    29 static bigtime_t start;
    30 static SDL_bool ticks_started = SDL_FALSE;
    31 
    32 void
    33 SDL_TicksInit(void)
    34 {
    35     if (ticks_started) {
    36         return;
    37     }
    38     ticks_started = SDL_TRUE;
    39 
    40     /* Set first ticks value */
    41     start = system_time();
    42 }
    43 
    44 void
    45 SDL_TicksQuit(void)
    46 {
    47     ticks_started = SDL_FALSE;
    48 }
    49 
    50 Uint32
    51 SDL_GetTicks(void)
    52 {
    53     if (!ticks_started) {
    54         SDL_TicksInit();
    55     }
    56 
    57     return ((system_time() - start) / 1000);
    58 }
    59 
    60 Uint64
    61 SDL_GetPerformanceCounter(void)
    62 {
    63     return system_time();
    64 }
    65 
    66 Uint64
    67 SDL_GetPerformanceFrequency(void)
    68 {
    69     return 1000000;
    70 }
    71 
    72 void
    73 SDL_Delay(Uint32 ms)
    74 {
    75     snooze(ms * 1000);
    76 }
    77 
    78 #endif /* SDL_TIMER_HAIKU */
    79 
    80 /* vi: set ts=4 sw=4 expandtab: */