| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // This file contains the GLES2Decoder class. | 5 // This file contains the GLES2Decoder class. |
| 6 | 6 |
| 7 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H | 7 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H |
| 8 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H | 8 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H |
| 9 | 9 |
| 10 #include <build/build_config.h> | 10 #include <build/build_config.h> |
| 11 #ifdef OS_WIN | 11 #if defined(OS_LINUX) |
| 12 #include "gpu/command_buffer/service/x_utils.h" |
| 13 #elif defined(OS_WIN) |
| 12 #include <windows.h> | 14 #include <windows.h> |
| 13 #endif | 15 #endif |
| 14 #include "gpu/command_buffer/service/common_decoder.h" | 16 #include "gpu/command_buffer/service/common_decoder.h" |
| 15 | 17 |
| 16 namespace command_buffer { | 18 namespace command_buffer { |
| 17 namespace gles2 { | 19 namespace gles2 { |
| 18 | 20 |
| 19 // This class implements the AsyncAPIInterface interface, decoding GLES2 | 21 // This class implements the AsyncAPIInterface interface, decoding GLES2 |
| 20 // commands and calling GL. | 22 // commands and calling GL. |
| 21 class GLES2Decoder : public CommonDecoder { | 23 class GLES2Decoder : public CommonDecoder { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 HWND hwnd_; | 76 HWND hwnd_; |
| 75 #endif | 77 #endif |
| 76 | 78 |
| 77 DISALLOW_COPY_AND_ASSIGN(GLES2Decoder); | 79 DISALLOW_COPY_AND_ASSIGN(GLES2Decoder); |
| 78 }; | 80 }; |
| 79 | 81 |
| 80 } // namespace gles2 | 82 } // namespace gles2 |
| 81 } // namespace command_buffer | 83 } // namespace command_buffer |
| 82 | 84 |
| 83 #endif // O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H | 85 #endif // O3D_COMMAND_BUFFER_SERVICE_CROSS_GLES2_CMD_DECODER_H |
| 84 | |
| OLD | NEW |