st/nine: Add struct nine_clipplane
authorPatrick Rudolph <siro@das-labor.org>
Tue, 25 Oct 2016 18:06:31 +0000 (20:06 +0200)
committerAxel Davy <axel.davy@ens.fr>
Tue, 20 Dec 2016 22:44:22 +0000 (23:44 +0100)
Required to know the size exact size of the plane.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
src/gallium/state_trackers/nine/device9.c
src/gallium/state_trackers/nine/nine_state.c
src/gallium/state_trackers/nine/nine_state.h

index 8493e706fe8b69854bf3536db687c0afea6f1d48..8f5f117951f6a237363c2d51c6f7c3dcc657fae5 100644 (file)
@@ -2188,7 +2188,7 @@ NineDevice9_SetClipPlane( struct NineDevice9 *This,
     if (unlikely(This->is_recording))
         state->changed.ucp |= 1 << Index;
     else
-        nine_context_set_clip_plane(This, Index, pPlane);
+        nine_context_set_clip_plane(This, Index, (struct nine_clipplane *)pPlane);
 
     return D3D_OK;
 }
index 6b4c77c773acd02e4d0781a4ac0f64f62b41c8d2..d18435f1aefb09acae857440bb7ec1019c76cf36 100644 (file)
@@ -1676,7 +1676,7 @@ nine_context_set_texture_stage_state(struct NineDevice9 *device,
 void
 nine_context_set_clip_plane(struct NineDevice9 *device,
                             DWORD Index,
-                            const float *pPlane)
+                            struct nine_clipplane *pPlane)
 {
     struct nine_context *context = &device->context;
 
@@ -2052,7 +2052,7 @@ nine_context_apply_stateblock(struct NineDevice9 *device,
     if (src->changed.ucp)
         for (i = 0; i < PIPE_MAX_CLIP_PLANES; ++i)
             if (src->changed.ucp & (1 << i))
-                nine_context_set_clip_plane(device, i, &src->clip.ucp[i][0]);
+                nine_context_set_clip_plane(device, i, (struct nine_clipplane*)&src->clip.ucp[i][0]);
 
     if (!(src->changed.group & NINE_STATE_FF))
         return;
index d5cbbd4198b1dfbfb1717af47d67fb4e68b468b0..9e863bcd350911ad40a8857b7db79af5404e9877 100644 (file)
@@ -323,6 +323,9 @@ struct nine_state_sw_internal {
     struct pipe_transfer *transfers_so[4];
 };
 
+struct nine_clipplane {
+    float plane[4];
+};
 /* map D3DRS -> NINE_STATE_x
  */
 extern const uint32_t nine_render_state_group[NINED3DRS_COUNT];
@@ -459,7 +462,7 @@ nine_context_set_depth_stencil(struct NineDevice9 *device,
 void
 nine_context_set_clip_plane(struct NineDevice9 *device,
                             DWORD Index,
-                            const float *pPlane);
+                            struct nine_clipplane *pPlane);
 
 void
 nine_context_set_swvp(struct NineDevice9 *device,