Henri Verbeet : wined3d: Get rid of redundant NULL checks for event query "extendedData".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0a5e205c06e0f0ccf632e02a48e86a386a4884e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0a5e205c06e0f0ccf632e02a48...

Author: Henri Verbeet 
Date:   Thu Jul 21 15:57:58 2016 +0200

wined3d: Get rid of redundant NULL checks for event query "extendedData".

If creation succeeded this is non-NULL.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/query.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index c8d6b47..c09fe86 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -244,7 +244,7 @@ static void wined3d_query_destroy_object(void *object)
     if (query->type == WINED3D_QUERY_TYPE_EVENT)
     {
         struct wined3d_event_query *event_query = query->extendedData;
-        if (event_query) wined3d_event_query_destroy(event_query);
+        wined3d_event_query_destroy(event_query);
     }
     else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION)
     {
@@ -389,14 +389,8 @@ static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query,

TRACE("query %p, data %p, size %#x, flags %#x.\n", query, data, size, flags);

-    if (!data || !size) return S_OK;
-    if (!event_query)
-    {
-        WARN("Event query not supported by GL, reporting GPU idle.\n");
-        signaled = TRUE;
-        fill_query_data(data, size, &signaled, sizeof(signaled));
+    if (!data || !size)
         return S_OK;
-    }

ret = wined3d_event_query_test(event_query, query->device);
     switch(ret)
@@ -449,9 +443,6 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD
     {
         struct wined3d_event_query *event_query = query->extendedData;

-        /* Faked event query support */
-        if (!event_query) return WINED3D_OK;
-
         wined3d_event_query_issue(event_query, query->device);
     }
     else if (flags & WINED3DISSUE_BEGIN)