Ignore:
Timestamp:
Nov 21, 2011, 1:49:47 AM (8 years ago)
Author:
sam
Message:

core: port all code to NativeClient. Nothing runs for now, but it builds.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/debug/quad.cpp

    r1051 r1082  
    154154    if (!data->initialised && !IsDestroying())
    155155    {
    156 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     156#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    157157        glGenVertexArrays(NUM_ARRAYS, data->array);
    158158#endif
     
    184184    else if (data->initialised && IsDestroying())
    185185    {
    186 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     186#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    187187        glDeleteVertexArrays(NUM_ARRAYS, data->array);
    188188#endif
     
    495495     * Renders an orange square.
    496496     */
    497 #if !defined __ANDROID__ && !defined __APPLE__
     497#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    498498    glColor4f(orange.x, orange.y, orange.z, orange.w);
    499499    glEnableClientState(GL_VERTEX_ARRAY);
     
    513513     * Renders a green sine wave made of 1-pixel points.
    514514     */
    515 #if !defined __ANDROID__ && !defined __APPLE__
     515#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    516516    glColor4f(0.0f, 1.0f, 0.0f, 1.0f);
    517517    glPointSize(1.0f);
     
    532532     * Renders a multicoloured square with varying colors.
    533533     */
    534 #if !defined __ANDROID__ && !defined __APPLE__
     534#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    535535    glEnableClientState(GL_VERTEX_ARRAY);
    536536    glEnableClientState(GL_COLOR_ARRAY);
     
    553553     * animated distorted checkerboard.
    554554     */
    555 #if !defined __ANDROID__ && !defined __APPLE__
     555#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    556556    glEnable(GL_TEXTURE_2D);
    557557    glBindTexture(GL_TEXTURE_2D, data->texture[0]);
     
    581581     * Renders an orange square.
    582582     */
    583 #if !defined __ANDROID__ && !defined __APPLE__
     583#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    584584    if (!shader[0])
    585585#if !defined __CELLOS_LV2__
     
    627627     * Renders an orange square.
    628628     */
    629 #if !defined __ANDROID__ && !defined __APPLE__
     629#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    630630    if (!shader[0])
    631631    {
     
    680680     * Renders a static, coloured and tiled pattern.
    681681     */
    682 #if !defined __ANDROID__ && !defined __APPLE__
     682#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    683683    if (!shader[0])
    684684#if !defined __CELLOS_LV2__
     
    733733     * Renders a multicoloured square with varying colors.
    734734     */
    735 #if !defined __ANDROID__ && !defined __APPLE__
     735#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    736736    if (!shader[0])
    737737    {
     
    797797     * Renders an antialiased green sine wave made of 1-pixel points.
    798798     */
    799 #if !defined __ANDROID__ && !defined __APPLE__ && !defined __CELLOS_LV2__
     799#if !defined __ANDROID__ && !defined __APPLE__ && !defined __CELLOS_LV2__ && !defined __native_client__
    800800    if (!shader[0])
    801801        shader[0] = Shader::Create(
     
    843843     * animated distorted checkerboard.
    844844     */
    845 #if !defined __ANDROID__ && !defined __APPLE__
     845#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    846846    if (!shader[0])
    847847#if !defined __CELLOS_LV2__
     
    916916     * animated distorted checkerboard.
    917917     */
    918 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     918#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    919919    if (!shader[0])
    920920    {
     
    986986     * animated distorted checkerboard.
    987987     */
    988 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     988#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    989989    if (!shader[0])
    990990    {
     
    10741074#endif
    10751075
    1076 #if !defined __ANDROID__ && !defined __APPLE__
     1076#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    10771077    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
    10781078#endif
     
    10831083    glClientActiveTexture(GL_TEXTURE0);
    10841084#endif
    1085 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     1085#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    10861086    glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
    10871087#endif
     
    10891089
    10901090    glDisable(GL_BLEND);
    1091 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     1091#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    10921092    glDisable(GL_POINT_SPRITE);
    10931093#endif
     
    11011101#endif
    11021102
    1103 #if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     1103#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
    11041104    glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
    11051105#endif
Note: See TracChangeset for help on using the changeset viewer.