Move the core of the primitives addon into the core.

This is the first step of #1003, enabling future rendering unification changes.

On OpenGL, this is feature neutral, as the implementation is mostly copy-paste.

On Direct3D this is more involved, as we remove the second shader system and use core's shaders. I believe this should have similar hardware support to the old system, but is far simpler.

Author: SiegeLord

addons/native_dialog/gtk_dialog.c

@@ -1,6 +1,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#define ALLEGRO_INTERNAL_UNSTABLE
 #include "allegro5/allegro.h"
 #include "allegro5/allegro_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog.h"

addons/primitives/CMakeLists.txt

@@ -1,23 +1,13 @@
 set(PRIMITIVES_SOURCES
     high_primitives.c
-    line_soft.c
-    point_soft.c
     polygon.c
     polyline.c
-    prim_directx.cpp
-    prim_opengl.c
     prim_soft.c
     prim_util.c
     primitives.c
     triangulator.c
     )
 
-if(WIN32)
-    # Add this file conditionally.
-    # The Debian folks want to remove it because it contains precompiled code.
-    list(APPEND PRIMITIVES_SOURCES directx_shaders.cpp)
-endif(WIN32)
-
 set(PRIMITIVES_INCLUDE_FILES allegro5/allegro_primitives.h)
 
 set_our_header_properties(${PRIMITIVES_INCLUDE_FILES})

addons/primitives/allegro5/allegro_primitives.h

@@ -2,6 +2,7 @@
 #define __al_included_allegro5_allegro_primitives_h
 
 #include <allegro5/allegro.h>
+#include <allegro5/internal/aintern_primitives_types.h>
 
 #if (defined ALLEGRO_MINGW32) || (defined ALLEGRO_MSVC) || (defined ALLEGRO_BCC32)
 #ifndef ALLEGRO_STATICLINK
@@ -31,57 +32,6 @@ extern "C"
 #endif
 
 
-/* Enum: ALLEGRO_PRIM_TYPE
- */
-typedef enum ALLEGRO_PRIM_TYPE
-{
-  ALLEGRO_PRIM_LINE_LIST,
-  ALLEGRO_PRIM_LINE_STRIP,
-  ALLEGRO_PRIM_LINE_LOOP,
-  ALLEGRO_PRIM_TRIANGLE_LIST,
-  ALLEGRO_PRIM_TRIANGLE_STRIP,
-  ALLEGRO_PRIM_TRIANGLE_FAN,
-  ALLEGRO_PRIM_POINT_LIST,
-  ALLEGRO_PRIM_NUM_TYPES
-} ALLEGRO_PRIM_TYPE;
-
-enum
-{
-   ALLEGRO_PRIM_MAX_USER_ATTR = _ALLEGRO_PRIM_MAX_USER_ATTR
-};
-
-/* Enum: ALLEGRO_PRIM_ATTR
- */
-typedef enum ALLEGRO_PRIM_ATTR
-{
-   ALLEGRO_PRIM_POSITION = 1,
-   ALLEGRO_PRIM_COLOR_ATTR,
-   ALLEGRO_PRIM_TEX_COORD,
-   ALLEGRO_PRIM_TEX_COORD_PIXEL,
-   ALLEGRO_PRIM_USER_ATTR,
-   ALLEGRO_PRIM_ATTR_NUM = ALLEGRO_PRIM_USER_ATTR + ALLEGRO_PRIM_MAX_USER_ATTR
-} ALLEGRO_PRIM_ATTR;
-
-/* Enum: ALLEGRO_PRIM_STORAGE
- */
-typedef enum ALLEGRO_PRIM_STORAGE
-{
-   ALLEGRO_PRIM_FLOAT_2,
-   ALLEGRO_PRIM_FLOAT_3,
-   ALLEGRO_PRIM_SHORT_2,
-   ALLEGRO_PRIM_FLOAT_1,
-   ALLEGRO_PRIM_FLOAT_4,
-   ALLEGRO_PRIM_UBYTE_4,
-   ALLEGRO_PRIM_SHORT_4,
-   ALLEGRO_PRIM_NORMALIZED_UBYTE_4,
-   ALLEGRO_PRIM_NORMALIZED_SHORT_2,
-   ALLEGRO_PRIM_NORMALIZED_SHORT_4,
-   ALLEGRO_PRIM_NORMALIZED_USHORT_2,
-   ALLEGRO_PRIM_NORMALIZED_USHORT_4,
-   ALLEGRO_PRIM_HALF_FLOAT_2,
-   ALLEGRO_PRIM_HALF_FLOAT_4
-} ALLEGRO_PRIM_STORAGE;
-
 /* Enum: ALLEGRO_LINE_JOIN
  */
 typedef enum ALLEGRO_LINE_JOIN
@@ -104,60 +54,11 @@ typedef enum ALLEGRO_LINE_CAP
    ALLEGRO_LINE_CAP_CLOSED
 } ALLEGRO_LINE_CAP;
 
-/* Enum: ALLEGRO_PRIM_BUFFER_FLAGS
- */
-typedef enum ALLEGRO_PRIM_BUFFER_FLAGS
-{
-   ALLEGRO_PRIM_BUFFER_STREAM       = 0x01,
-   ALLEGRO_PRIM_BUFFER_STATIC       = 0x02,
-   ALLEGRO_PRIM_BUFFER_DYNAMIC      = 0x04,
-   ALLEGRO_PRIM_BUFFER_READWRITE    = 0x08
-} ALLEGRO_PRIM_BUFFER_FLAGS;
-
-/* Enum: ALLEGRO_VERTEX_CACHE_SIZE
- */
-#define ALLEGRO_VERTEX_CACHE_SIZE 256
 
 /* Enum: ALLEGRO_PRIM_QUALITY
  */
 #define ALLEGRO_PRIM_QUALITY 10
 
-/* Type: ALLEGRO_VERTEX_ELEMENT
- */
-typedef struct ALLEGRO_VERTEX_ELEMENT ALLEGRO_VERTEX_ELEMENT;
-
-struct ALLEGRO_VERTEX_ELEMENT {
-   int attribute;
-   int storage;
-   int offset;
-};
-
-/* Type: ALLEGRO_VERTEX_DECL
- */
-typedef struct ALLEGRO_VERTEX_DECL ALLEGRO_VERTEX_DECL;
-
-/* Duplicated in allegro5/internal/aintern_tri_soft.h */
-#ifndef _ALLEGRO_VERTEX_DEFINED
-#define _ALLEGRO_VERTEX_DEFINED
-
-/* Type: ALLEGRO_VERTEX
- */
-typedef struct ALLEGRO_VERTEX ALLEGRO_VERTEX;
-
-struct ALLEGRO_VERTEX {
-  float x, y, z;
-  float u, v;
-  ALLEGRO_COLOR color;
-};
-#endif
-
-/* Type: ALLEGRO_VERTEX_BUFFER
- */
-typedef struct ALLEGRO_VERTEX_BUFFER ALLEGRO_VERTEX_BUFFER;
-
-/* Type: ALLEGRO_INDEX_BUFFER
- */
-typedef struct ALLEGRO_INDEX_BUFFER ALLEGRO_INDEX_BUFFER;
 
 ALLEGRO_PRIM_FUNC(uint32_t, al_get_allegro_primitives_version, (void));
 

addons/primitives/allegro5/internal/aintern_prim.h renamed to addons/primitives/allegro5/internal/aintern_prim_addon.h

@@ -1,5 +1,7 @@
-#ifndef __al_included_allegro5_aintern_prim_h
-#define __al_included_allegro5_aintern_prim_h
+#ifndef __al_included_allegro5_aintern_prim_addon_h
+#define __al_included_allegro5_aintern_prim_addon_h
+
+#include <allegro5/internal/aintern_primitives_types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,13 +13,6 @@ enum ALLEGRO_PRIM_VERTEX_CACHE_TYPE
    ALLEGRO_PRIM_VERTEX_CACHE_LINE_STRIP
 };
 
-struct ALLEGRO_VERTEX_DECL {
-   ALLEGRO_VERTEX_ELEMENT* elements;
-   int stride;
-   void* d3d_decl;
-   void* d3d_dummy_shader;
-};
-
 typedef struct ALLEGRO_PRIM_VERTEX_CACHE {
    ALLEGRO_VERTEX  buffer[ALLEGRO_VERTEX_CACHE_SIZE];
    ALLEGRO_VERTEX* current;
@@ -27,31 +22,6 @@ typedef struct ALLEGRO_PRIM_VERTEX_CACHE {
    void*           user_data;
 } ALLEGRO_PRIM_VERTEX_CACHE;
 
-typedef struct ALLEGRO_BUFFER_COMMON {
-   uintptr_t handle;
-   bool write_only;
-   /* In elements */
-   int size;
-
-   bool is_locked;
-   int lock_flags;
-   void* locked_memory;
-    /* These three are in bytes */
-   int local_buffer_length;
-   int lock_offset;
-   int lock_length;
-} ALLEGRO_BUFFER_COMMON;
-
-struct ALLEGRO_VERTEX_BUFFER {
-   ALLEGRO_VERTEX_DECL* decl;
-   ALLEGRO_BUFFER_COMMON common;
-};
-
-struct ALLEGRO_INDEX_BUFFER {
-   int index_size;
-   ALLEGRO_BUFFER_COMMON common;
-};
-
 /* Internal cache for primitives. */
 void _al_prim_cache_init(ALLEGRO_PRIM_VERTEX_CACHE* cache, int prim_type, ALLEGRO_COLOR color);
 void _al_prim_cache_init_ex(ALLEGRO_PRIM_VERTEX_CACHE* cache, int prim_type, ALLEGRO_COLOR color, void* user_data);
@@ -69,9 +39,6 @@ bool      _al_prim_is_point_in_triangle(const float* point, const float* v0, con
 bool      _al_prim_intersect_segment(const float* v0, const float* v1, const float* p0, const float* p1, float* point, float* t0, float* t1);
 bool      _al_prim_are_points_equal(const float* point_a, const float* point_b);
 
-int _al_bitmap_region_is_locked(ALLEGRO_BITMAP* bmp, int x1, int y1, int x2, int y2);
-int _al_draw_buffer_common_soft(ALLEGRO_VERTEX_BUFFER* vertex_buffer, ALLEGRO_BITMAP* texture, ALLEGRO_INDEX_BUFFER* index_buffer, int start, int end, int type);
-
 #ifdef __cplusplus
 }
 #endif